cleanup of unwanted commented code