CLN: Remove unused code, legacy from mr.
Merge pull request #66 from danielballan/remove-legacy

CLN: Remove unused code, legacy from mr.