minimal cleanup