doing some major clean up getting rid of old/tmp/deprecated classes