m3s: Source cleanup