Android UI cleanup