Fixed unnecessary things being in augroups.