Removed Page Size logic