Demo Src Cleanup