Using cleanup is cleaner