Revert: Clean up softap interface