Removed code that wasn't needed