Continuing to clean up make/msp