Commenting and clean up for all pages except routes