Switched back to Settings Dictionary to keep track of bot settings
Final cleanup for release branch