Cleanup for CC3000 work