Remove generic schema elements