First cut for a very conservative source tree cleanup: