Some more code clean, radio off removed