Removal of redundent code