Cleanups

Also removed unused imports, remove unused click listener