Deleted unecessary old code