Removed first set of deprecated code