Removed unneeded commons classes