Removed old 'lock' code