Merge "Clean up softap interface"