don't need pages anymore

merge all this back in