Clean up the atomic-composer role