Remove some duplicate definitions