Branch switching aliases
Phrasing changes
Remove unused Services