Remove obsolete aliases
Add proper group declarations