Reimplement user click handler
Remove code that is superseded in ornament