Rm starts with ends with

This will be a much smaller pull request (1 commit, 3 files) when/if the mega-pull-request #371 is accepted.  Resolves #359 and #361.