Remove orphaned Theme related code