[TASK] Remove legacy code
Merge pull request #389 from hmspl/legacy

[TASK] Remove legacy code