Unnecessary code removed