Remove android support