Commented out unnecessary code from initial project