[cleanup] finishing new schema specs