Unnecessary code removed!