Cleanup aliases
Lots of git extras changes