Make cleanup work way faster