Remove conflicting constants