removed delete listener things
removed the unused icons and fixed some code review things