Final commit before trimming for distribution