remove Closure support
remove more closure
modify structure
remove backwards compatibility