Issue #2318927 by slashrsm: Remove legacy code.
Merge pull request #11 from slashrsm/2318927

Remove legacy code