Compose cleanups