Removed some of the mutexes from the optimiser struct. Removed some un-needed todos