remove checks
ogl test code
minor
clean-up
clean-up