Remove a man page merge leftover, minor comments typo fixes