Title: EClean Issue 47