Commented and delete unnecessary code