Merge cbrightsci fork into main project.

Delete these timing lines