move services up in tree
remove dead code