some cleanup, see #444