Made ControlPlantState obsolete and merged control plant logic with experimental plant logic
Merge changes