Remove locking, we'll do it live