- some cleanups, feature #4333