More renames and refactoring

- Removed anonymous "ClickListener" classes
Delete unused file