MSP: Replace smart pointer
REBASEME