further epsilon cleaning