more cleanup, check-looping disabled