Remove android as keyword