Congress: comments and clean up unused code