long_term support in cleanup methods