Remove some logging etc