Removed other orphaned lock variables