Base: More dynamic page clean up