(MESS) vcs/ctrl: Cleanup. (nw)