removed dupplicate code, and fix command render (due to introduction of conditional code marker)