Edoc cleanup