removed epitome specific stuff