Removed unwanted duplicate code.

Fixes #36