Removed code which was commented out, ie unused