clean up schema a bit per 4.x -isms