rename
remove unused refs
service