Remove unused var; progress on #17.