Remove legacy code.
Merge pull request #101 from frankban/remove-legacy-code

Remove legacy code.