multi-platform cleanup