loops like to be terminated
cleanups to pass test:quick