Remove unlock check