Code clean up; Remove unnecessary code