clean up and consolidations