Remove unused augroup
Update sourcing logic