Cleanup of Sites & Spills

Feedback