Remove lock related things, but keep track of where locking is needed for possible future use.