[DH] Added tools and dev aliases
[DH] Removed out-of-date/out-of-step overrides