make method not relay on pagecontext
revert inalid change to loader
remove unnecessary comment
revert inalid change to loader