Move screen unlocking inside cleanup()