Refactor clicks and remove dead code

Change-Id: Id92f43b4f6b31707a18035dace6ad14ab728d0bb
2 files changed