Clean up and align project settings