clean up messages and warnings