update wifi support and cleanup