Remove some unused and confusing duplicate code