ANDROID_HOME

also some cleanup of old junk