a few final cleanups for wk1