Clean up Raw