removed unneccessary code and tests