Remove old representation of CSEnv; part of #5996