Some minor cleanups and code smell refactoring
Removing the StuffPage demo, coz it's pointless