Further simplication and cleanup.