more untested cleanup