Revert "Catalog change"

This reverts commit be49585d64cb11d86ec9023b0019b6ced54ecb48.
Revert "HeapPageId"

This reverts commit 810db9f745bc70a797b1959143445afdf00d302a.