FORGE-1489: Fixed remove command