Fixing up remove command