Fixed #31 - Removed deprecated code