Remove concept of 'unlocking'