- removed unnecessary code