clean the code, with old comments