Clean up SCVA