Remove double cast