Remove superfluous schema. Resolve name collision