Remove uneccesary prints to *Messages*, silence more warnings, tidy up.