Cleanup and logspam reduction