cleanup unused classes, removed gl dependancies