Refactored out local aliases and local config