Enhance page class : remove unused "current" property