some coments and do an actual "cleanUp"