Futher clean up
Misc clean up
Merge branch 'master' into opengl