Cleanup imports/whitespace in MD-SAL