Attempting to clean up logging and fictitious comments