removed unneeded code and classes