Remove OnControl methods & add up-calls

No match.