[JAIEXT-30] Remove legacy code
Merge pull request #16 from n-lagomarsini/JAIEXT-30

[JAIEXT-30] Remove legacy code