More cleanup (some of which is due to the last cleanup)