MDSALManager clean-up part 1