#49 Fixbug clean class