Please find attached a minor cleanup patch.