removing obsolete code
conditional event triggers