removed some code from clapper  demo