Merge "Refactor clicks and remove dead code" into ub-now-mister-ugly