diff --git a/RasTbl.cxx b/RasTbl.cxx
index 5c1aeb00..1491aff4 100644
--- a/RasTbl.cxx
+++ b/RasTbl.cxx
@@ -1571,24 +1571,6 @@ int GatewayRec::PrefixMatch(
 	return -1;
 }
 
-/*
-void GatewayRec::BuildLCF(H225_LocationConfirm & obj_lcf) const
-{
-	EndpointRec::BuildLCF(obj_lcf);
-	if (PINDEX as = Prefixes.size()) {
-		obj_lcf.IncludeOptionalField(H225_LocationConfirm::e_supportedProtocols);
-		obj_lcf.m_supportedProtocols.SetSize(1);
-		H225_SupportedProtocols &protocol = obj_lcf.m_supportedProtocols[0];
-		protocol.SetTag(H225_SupportedProtocols::e_voice);
-		H225_ArrayOf_SupportedPrefix & supportedPrefixes = ((H225_VoiceCaps &)protocol).m_supportedPrefixes;
-		supportedPrefixes.SetSize(as);
-		const_prefix_iterator Iter = Prefixes.begin();
-		for (PINDEX p = 0; p < as; ++p, ++Iter)
-			H323SetAliasAddress(PString(Iter->c_str()), supportedPrefixes[p].m_prefix);
-	}
-}
-*/
-
 PString GatewayRec::PrintOn(bool verbose) const
 {
 	PString msg = EndpointRec::PrintOn(verbose);
@@ -5447,15 +5429,11 @@ void CallTable::CheckRTPInactive()
 
 #ifdef HAS_H460
 
-static PTextFile* OpenQoSFile(const PFilePath & fn)
+static PTextFile * OpenQoSFile(const PFilePath & fn)
 {
-	PTextFile* qosFile = new PTextFile(fn, PFile::ReadWrite,
-		PFile::Create | PFile::DenySharedWrite
-		);
+	PTextFile* qosFile = new PTextFile(fn, PFile::ReadWrite, PFile::Create | PFile::DenySharedWrite);
 	if (!qosFile->IsOpen()) {
-   	    PTRACE(1, "QoS\tCould not open log file "
-			<< fn << "\" :" << qosFile->GetErrorText()
-			);
+   	    PTRACE(1, "QoS\tCould not open log file " << fn << "\" :" << qosFile->GetErrorText());
 		delete qosFile;
 	    return NULL;
 	}
@@ -5471,7 +5449,7 @@ void CallTable::OnQosMonitoringReport(const PString & conference, const endptr &
 
 	H4609_ArrayOf_RTCPMeasures report;
 
-	if (qosdata.GetTag() == H4609_QosMonitoringReportData::e_periodic) {
+    if (qosdata.GetTag() == H4609_QosMonitoringReportData::e_periodic) {
         H4609_PeriodicQoSMonReport & rep = qosdata;
 		H4609_ArrayOf_PerCallQoSReport & percall = rep.m_perCallInfo;
         report = percall[0].m_mediaChannelsQoS;
@@ -5602,7 +5580,6 @@ void CallTable::OnQosMonitoringReport(const PString & conference, const endptr &
 			params["t"] = nowtime.AsString();
 
 			toolkit->QoS().PostRecord(params);
-			//return;	// disabled: allow DB plus file to be active at same time
 		}
 #endif  // HAS_DATABASE
 
@@ -5676,12 +5653,11 @@ void CallTable::QoSReport(const H225_DisengageRequest & obj_drq, const endptr &
 		&& ((report.GetTag() == H4609_QosMonitoringReportData::e_final) || (report.GetTag() == H4609_QosMonitoringReportData::e_periodic))) {
 		PTRACE(5, "QoS\tReport " << report);
 		OnQosMonitoringReport(AsString(obj_drq.m_conferenceID), ep, report);
-
 	} else {
 		PTRACE(4, "QoS\tDRQ Call Statistics decode failure");
 	}
 }
-#endif
+#endif // HAS_H460
 
 void CallTable::RemoveCall(const H225_DisengageRequest & obj_drq, const endptr & ep)
 {
diff --git a/RasTbl.h b/RasTbl.h
index 3a40386c..3d2aea96 100644
--- a/RasTbl.h
+++ b/RasTbl.h
@@ -105,7 +105,7 @@ class EndpointRec
 	*/
 	EndpointRec(
 		/// RRQ, ARQ, ACF or LCF that contains a description of the endpoint
-		const H225_RasMessage& ras,
+		const H225_RasMessage & ras,
 		/// permanent endpoint flag
 		bool permanent = false
 		);
@@ -180,9 +180,6 @@ class EndpointRec
 	virtual EndpointRec *Unregister();
 	virtual EndpointRec *Expired();
 
-	//virtual void BuildACF(H225_AdmissionConfirm &) const;
-	//virtual void BuildLCF(H225_LocationConfirm &) const;
-
 	virtual PString PrintOn(bool verbose) const;
 	PString PrintPrefixCapacities() const;
 	PString PrintNatInfo(bool verbose) const;
@@ -491,8 +488,6 @@ class GatewayRec : public EndpointRec {
 		int & priority
 		) const;
 
-	//virtual void BuildLCF(H225_LocationConfirm &) const;
-
 	virtual PString PrintOn(bool verbose) const;
 
 	void AddPrefixes(const H225_ArrayOf_SupportedProtocols &);
@@ -690,9 +685,6 @@ class H46019KeepAlive
 // record of one active call
 #ifdef HAS_H460
 class H4609_QosMonitoringReportData;
-#ifdef HAS_H46024B
-class H323TransportAddress;
-#endif // HAS_H46024B
 #endif // HAS_H460
 
 #ifdef HAS_H46018
@@ -1730,8 +1722,6 @@ typedef CallRec::Ptr callptr;
 
 // all active calls
 
-class H4609_QosMonitoringReportData;
-
 class CallTable : public Singleton<CallTable>
 {
 public:
@@ -1779,7 +1769,7 @@ class CallTable : public Singleton<CallTable>
 	void PrintCallInfo(USocket *client, const PString & callid) const;
 
 #ifdef HAS_H460
-	void OnQosMonitoringReport(const PString &,const endptr &, H4609_QosMonitoringReportData &);
+	void OnQosMonitoringReport(const PString &, const endptr &, H4609_QosMonitoringReportData &);
     void QoSReport(const H225_DisengageRequest &, const endptr &, const PASN_OctetString &);
     void QoSReport(const H225_InfoRequestResponse &, const callptr &, const endptr &, const PASN_OctetString &);
 #endif
@@ -1790,7 +1780,7 @@ class CallTable : public Singleton<CallTable>
 
 	PINDEX Size() const { return m_activeCall; }	// number of currently active calls
 	unsigned TotalCallCount() const { return m_CallCount; }	// number of calls since startup
-	unsigned SuccessfulCallCount() const { return m_successCall; }	// number of succesfull calls since startup
+	unsigned SuccessfulCallCount() const { return m_successCall; }	// number of successful calls since startup
 
 	/** @return
 	    Timeout value for a signaling channel to be opened after ACF