Refactor, get rid of wireless_tools dependency