WPML generator cleanup