Remove redundancies

remove unnecessary code