commants cleanup