Do not merge habari and addon version, that was dumb. We need those later.
Oops, I forgot to remove an entire function.