Preparing for merge and new branching. Removing timing.