Naming changes.
Removed unused configuration.
Remove long-waiting users from the line.