ensure cleanup method/flags added