Remove AddOnActivity and AddOnService