Add check existence of lock file and make removal synchronous