PIM-2696: Clean up