Remove old code
Merge pull request #1132 from yemel/refactor/remove-old-code

Remove old code