Remove OnControl methods & add up-calls