Updates for the deletion of EclipseUserSimulator