Removes duplicate code from bad merge