Removed cvsrc; I hope it never returns
Updated S.dev to match current work style