Cleanup sources and some small automation.