Cleanup. Android fix