- Removed deprecated code from 2.1 branch
       - Removed all code deprecated in branch 2.1.s