Removed unused & deprecated code