MSS-8 cleanup