gma500: clean up some more checks