Refactoring. Removing unnecessery configurations and classes.