Cleanup code
Remove buggy click behavior