Cleanups and consolidations