Unecessary schema keywords removed