delete unused functions, add services