FM/SB: Code Cleanup for PivotManager