remove unused fields
merge cloned event handlers