Refactoring updates.
Removed configuration.