Adapt remove commands to set commands

Signed-off-by: Lars Kiesow <lkiesow@uos.de>