Removed unneeded classes