Fix the remove command a bit.