ZD-Integration: Removal of SupportSim code (not including JSP)