Clean unused code and fix clicks