removed legacy debug stuff
Merge branch 'object_classes'