Clean up
Demonstration site adjustments