SPAR MD functions clean up, integration