cleanups and consolidations