Remove unneeded Theme inversion code