[cleanup] - first steps clean up schema duplication, needs more testing