Remove some redundant legacy code
Merge pull request #25 from bbatsov/legacy

Remove some redundant legacy code