Radio command and some cleanup