Removed unneeded classes and added to Definitions