Redundant includes were deleted