MSS-94 minor cleanup