Title: EClean Issue 19