ditch entity api for now, and other cleanups