clean up schema a bit