Removed unnecessary classes from old style file