Feature/cluster plans deprecations