Minimal cleanup