msn: Remove dead code and simplify a bit