#126 cleaned up Plant