Remove most defaults from schemas - SIDP-204