Tidy up remove some logging