* cleanup in the android java code