Removed unused class placeholders and junk.