remove callbacks and simplify logic
remove callbacks and simplify logic

MelvinTo/firewalla,MelvinTo/firewalla,firewalla/firewalla,firewalla/firewalla,MelvinTo/firewalla,MelvinTo/firewalla,firewalla/firewalla,firewalla/firewalla,firewalla/firewalla,MelvinTo/firewalla