Cleaning up some code, removing unnecessary db calls and work for areas of Pages where we don't need the work done.