This is correct! However to make this PR more testable I have included it for now.
Ho about removing it when the Cluster Type feature is added?