General project cleanup
Post-cleanup general sync