Removed unnecessary code throughout project.