Removed code which didn't belong