Removed Dummy Classes