removed unnecessary code / comments