removed unused or deprecated code