[WIP] cleanups - do not merge