Removed code that was not needed