Stripped the Intershop Enfinity specific stuff