cleanup
Added Android port