more cleanups(untested)