cleaning up junk classes