move old service code to deprecated
remove deprecated code