Rename forced to force and remove some logging