Final commit

removed redundant code