Cleaning up logging, unused code