Remove page generated and other minor changes