modified Management module with new cleanup routine