Deleted unneeded and commented out code.