Commented away deprecated code