Cleanup S1C1 Energy2D model and interactive

[#56003740]
[#58655720]
[#81011226]