And deleted unneeded code.