remove comments and clean up