more msdl cleanup