cleanup for UMS