Cleanup

pull wan_monitor refactor back in.