Removing DutyCommand out of SinkCommands