Remove android hacks