Consolidate aliases/functions and remove cruft