deleted unneeded commented out blocs