todo minor
orm mapper various minor cleanups, towards separation