Remove old code and fix group name
Merge branch 'ubuntu_auth'