remove 2.1 hacks (fixes #88)
remove BC warning
Merge pull request #165 from sonata-project/remove_2_1_compat

remove 2.1 hacks (fixes #88)