Click Demo - removing deprecated code