Cleanup DataPageBuilder.cs