- removed some unnecessary code