Removing un-needed code