Removed deprecated code as stated in issue #194