Unnecessary code removal