More cleanup and consolidation...