Removing duplicates, with merged conflicts

This supersedes PR https://github.com/jhu-lcsr-forks/rtt/pull/8