some cleanups for the previous commit