removing old cruft
class name corrections