condense initialization code
old event support code removal