Removed code that isn't needed