mini-cleanup