Performance improvements
Removed useless configs