- removed commented & deprecated code