twofi: Clean up. Add to groups.