removed unnecessary code and tests