Clean up unused imports, and stuff

Change-Id: I0c4101983b44da558e45086cb9b011a858fffb25
[1/2] Gesture lockscreen option

Change-Id: If6cdb96c3f60850483d9f83abf4533989db02254