Increase performance and remove some debug logs.