PIM-2288: Clean methods