- Source Cleanup
- Parser Cleanup