#196 Removed deprecated code