Revert "Add missing bracket ")""

This reverts commit 57cb93697d4e597afd43d94185e29c01921b76a3.
Revert "Clean up lock screen interface code"

This reverts commit c1b6602fbe9af375b80016eae4268f58252cc252.