removed unneeded classes and code