remove deprecated pages and ndo support