cleanup and reduction in console spam