Final cleanup before demo