reduce logging and clean up messages