[~] large refactoring to remove legacy code. New base version is 33 (0.6.12)
[!] code is just compilable, not tested, not even ran