Remove until
add command object