Finally remove extra comments, re-make ms