Comment out & streamline page
Rejigger more things.