Removed Deprecated code.