FLOE-198: removed class option for instantiation