Unnecessary code was removed