Removed some dependencies on zenpage