Finish wireless bootstrapping. Code clean-up