Removed duplicate code leftover from bad merge