More cleanup after composition implementation.