removing un necessary code