Cleaning more lock -- may be should be extracted to separate patch if needed?