Strip out dependencies on Mrss