restore removed line
more cleanup of remarks