cleanup.
minor update for android, ios.
cleanup.
cleanup.
add TODO: refactor here.