Removed un-needed classes