changes for remove locked