Use prepare_shape
Remove final_fields