clean up, remove comments