#716 Added steal-remove start and ends to make build pass