bunch of small cleanups for new operation model