Clean out most diagnostic stuff