Clean up of Payette_mgr