Got rid of most of the WiFly stuff