diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp
index 1d4d4641..a5e8039f 100644
--- a/ISLE/isleapp.cpp
+++ b/ISLE/isleapp.cpp
@@ -281,9 +281,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	return msg.wParam;
 }
 
-// FUNCTION: ISLE 0x401c40
-// MxDSObject::SetAtomId
-
 // FUNCTION: ISLE 0x401ca0
 BOOL FindExistingInstance(void)
 {
diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/legoactioncontrolpresenter.h
index 880ee148..943abe03 100644
--- a/LEGO1/legoactioncontrolpresenter.h
+++ b/LEGO1/legoactioncontrolpresenter.h
@@ -25,10 +25,6 @@ class LegoActionControlPresenter : public MxMediaPresenter {
 		return !strcmp(name, LegoActionControlPresenter::ClassName()) || MxMediaPresenter::IsA(name);
 	}
 
-	// TODO: Find proper compilation unit to put this
-	// SYNTHETIC: LEGO1 0x1000d1d0
-	// LegoActionControlPresenter::`scalar deleting destructor'
-
 	virtual void ReadyTickle() override;           // vtable+0x18
 	virtual void RepeatingTickle() override;       // vtable+0x24
 	virtual void ParseExtra() override;            // vtable+0x30
@@ -41,4 +37,7 @@ class LegoActionControlPresenter : public MxMediaPresenter {
 	undefined4 m_unk0x64;      // 0x64
 };
 
+// SYNTHETIC: LEGO1 0x1000d1d0
+// LegoActionControlPresenter::`scalar deleting destructor'
+
 #endif // LEGOACTIONCONTROLPRESENTER_H
diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/legoinputmanager.cpp
index 3572c9bd..04b1c5f1 100644
--- a/LEGO1/legoinputmanager.cpp
+++ b/LEGO1/legoinputmanager.cpp
@@ -56,27 +56,6 @@ MxResult LegoInputManager::Create(HWND p_hwnd)
 	return SUCCESS;
 }
 
-// TEMPLATE: LEGO1 0x1005bb80
-// MxCollection<LegoEventNotificationParam>::Compare
-
-// TEMPLATE: LEGO1 0x1005bc30
-// MxCollection<LegoEventNotificationParam>::Destroy
-
-// TEMPLATE: LEGO1 0x1005bc80
-// MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
-
-// SYNTHETIC: LEGO1 0x1005bd50
-// MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1005bdc0
-// MxList<LegoEventNotificationParam>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1005beb0
-// LegoEventQueue::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1005bf70
-// MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x1005bfe0
 void LegoInputManager::Destroy()
 {
@@ -292,6 +271,3 @@ void LegoInputManager::KillTimer()
 		::KillTimer(omni->GetWindowHandle(), m_timer);
 	}
 }
-
-// TEMPLATE: LEGO1 0x1005d010
-// MxListEntry<LegoEventNotificationParam>::GetValue
diff --git a/LEGO1/legoinputmanager.h b/LEGO1/legoinputmanager.h
index 9a4fe6e7..11ededd8 100644
--- a/LEGO1/legoinputmanager.h
+++ b/LEGO1/legoinputmanager.h
@@ -90,4 +90,28 @@ class LegoInputManager : public MxPresenter {
 	MxBool m_unk0x336;
 };
 
+// TEMPLATE: LEGO1 0x1005bb80
+// MxCollection<LegoEventNotificationParam>::Compare
+
+// TEMPLATE: LEGO1 0x1005bc30
+// MxCollection<LegoEventNotificationParam>::Destroy
+
+// TEMPLATE: LEGO1 0x1005bc80
+// MxList<LegoEventNotificationParam>::~MxList<LegoEventNotificationParam>
+
+// SYNTHETIC: LEGO1 0x1005bd50
+// MxCollection<LegoEventNotificationParam>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1005bdc0
+// MxList<LegoEventNotificationParam>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1005beb0
+// LegoEventQueue::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1005bf70
+// MxQueue<LegoEventNotificationParam>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1005d010
+// MxListEntry<LegoEventNotificationParam>::GetValue
+
 #endif // LEGOINPUTMANAGER_H
diff --git a/LEGO1/legopathcontrollerlist.cpp b/LEGO1/legopathcontrollerlist.cpp
index 457729a4..18cf7b0e 100644
--- a/LEGO1/legopathcontrollerlist.cpp
+++ b/LEGO1/legopathcontrollerlist.cpp
@@ -11,32 +11,8 @@ MxS8 LegoPathControllerList::Compare(LegoPathController* p_a, LegoPathController
 	return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 }
 
-// TEMPLATE: LEGO1 0x1001d230
-// MxCollection<LegoPathController *>::Compare
-
-// TEMPLATE: LEGO1 0x1001d240
-// MxList<LegoPathController *>::MxList<LegoPathController *>
-
-// TEMPLATE: LEGO1 0x1001d2d0
-// MxCollection<LegoPathController *>::~MxCollection<LegoPathController *>
-
-// TEMPLATE: LEGO1 0x1001d320
-// MxCollection<LegoPathController *>::Destroy
-
-// TEMPLATE: LEGO1 0x1001d330
-// MxList<LegoPathController *>::~MxList<LegoPathController *>
-
 // FUNCTION: LEGO1 0x1001d3c0
 void LegoPathControllerList::Destroy(LegoPathController* p_controller)
 {
 	delete p_controller;
 }
-
-// SYNTHETIC: LEGO1 0x1001d490
-// MxCollection<LegoPathController *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001d500
-// MxList<LegoPathController *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001d5b0
-// MxPtrList<LegoPathController>::`scalar deleting destructor'
diff --git a/LEGO1/legopathcontrollerlist.h b/LEGO1/legopathcontrollerlist.h
index 5a7d4c60..ac22b53d 100644
--- a/LEGO1/legopathcontrollerlist.h
+++ b/LEGO1/legopathcontrollerlist.h
@@ -23,4 +23,28 @@ class LegoPathControllerList : public MxPtrList<LegoPathController> {
 // VTABLE: LEGO1 0x100d6398
 // class MxList<LegoPathController *>
 
+// TEMPLATE: LEGO1 0x1001d230
+// MxCollection<LegoPathController *>::Compare
+
+// TEMPLATE: LEGO1 0x1001d240
+// MxList<LegoPathController *>::MxList<LegoPathController *>
+
+// TEMPLATE: LEGO1 0x1001d2d0
+// MxCollection<LegoPathController *>::~MxCollection<LegoPathController *>
+
+// TEMPLATE: LEGO1 0x1001d320
+// MxCollection<LegoPathController *>::Destroy
+
+// TEMPLATE: LEGO1 0x1001d330
+// MxList<LegoPathController *>::~MxList<LegoPathController *>
+
+// SYNTHETIC: LEGO1 0x1001d490
+// MxCollection<LegoPathController *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001d500
+// MxList<LegoPathController *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001d5b0
+// MxPtrList<LegoPathController>::`scalar deleting destructor'
+
 #endif // LEGOPATHCONTROLLERLIST_H
diff --git a/LEGO1/legoworld.cpp b/LEGO1/legoworld.cpp
index 5129cca6..938abe3a 100644
--- a/LEGO1/legoworld.cpp
+++ b/LEGO1/legoworld.cpp
@@ -67,24 +67,6 @@ MxResult LegoWorld::SetAsCurrentWorld(MxDSObject& p_dsObject)
 	return SUCCESS;
 }
 
-// SYNTHETIC: LEGO1 0x1001eed0
-// MxPresenterListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1001ef40
-// MxPtrListCursor<MxPresenter>::~MxPtrListCursor<MxPresenter>
-
-// SYNTHETIC: LEGO1 0x1001ef90
-// MxListCursor<MxPresenter *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001f000
-// MxPtrListCursor<MxPresenter>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1001f070
-// MxListCursor<MxPresenter *>::~MxListCursor<MxPresenter *>
-
-// FUNCTION: LEGO1 0x1001f0c0
-// MxPresenterListCursor::~MxPresenterListCursor
-
 // FUNCTION: LEGO1 0x1001f5e0
 MxLong LegoWorld::Notify(MxParam& p_param)
 {
diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h
index 6bade062..8914604a 100644
--- a/LEGO1/legoworld.h
+++ b/LEGO1/legoworld.h
@@ -55,4 +55,22 @@ void FUN_10015820(MxU32 p_unk1, MxU32 p_unk2);
 void FUN_10015910(MxU32 p_unk1);
 void SetIsWorldActive(MxBool p_isWorldActive);
 
+// SYNTHETIC: LEGO1 0x1001eed0
+// MxPresenterListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001ef40
+// MxPtrListCursor<MxPresenter>::~MxPtrListCursor<MxPresenter>
+
+// SYNTHETIC: LEGO1 0x1001ef90
+// MxListCursor<MxPresenter *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001f000
+// MxPtrListCursor<MxPresenter>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1001f070
+// MxListCursor<MxPresenter *>::~MxListCursor<MxPresenter *>
+
+// FUNCTION: LEGO1 0x1001f0c0
+// MxPresenterListCursor::~MxPresenterListCursor
+
 #endif // LEGOWORLD_H
diff --git a/LEGO1/legoworldlist.cpp b/LEGO1/legoworldlist.cpp
index a62173b0..3c43744d 100644
--- a/LEGO1/legoworldlist.cpp
+++ b/LEGO1/legoworldlist.cpp
@@ -8,29 +8,8 @@ MxS8 LegoWorldList::Compare(LegoWorld* p_a, LegoWorld* p_b)
 	return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 }
 
-// TEMPLATE: LEGO1 0x100598f0
-// MxCollection<LegoWorld *>::Compare
-
-// TEMPLATE: LEGO1 0x10059900
-// MxCollection<LegoWorld *>::~MxCollection<LegoWorld *>
-
-// TEMPLATE: LEGO1 0x10059950
-// MxCollection<LegoWorld *>::Destroy
-
-// TEMPLATE: LEGO1 0x10059960
-// MxList<LegoWorld *>::~MxList<LegoWorld *>
-
 // FUNCTION: LEGO1 0x100599f0
 void LegoWorldList::Destroy(LegoWorld* p_world)
 {
 	delete p_world;
 }
-
-// SYNTHETIC: LEGO1 0x10059ac0
-// MxCollection<LegoWorld *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x10059b30
-// MxList<LegoWorld *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x10059be0
-// MxPtrList<LegoWorld>::`scalar deleting destructor'
diff --git a/LEGO1/legoworldlist.h b/LEGO1/legoworldlist.h
index 5e9a7c37..0185ceee 100644
--- a/LEGO1/legoworldlist.h
+++ b/LEGO1/legoworldlist.h
@@ -24,4 +24,25 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	static void Destroy(LegoWorld*);
 };
 
+// TEMPLATE: LEGO1 0x100598f0
+// MxCollection<LegoWorld *>::Compare
+
+// TEMPLATE: LEGO1 0x10059900
+// MxCollection<LegoWorld *>::~MxCollection<LegoWorld *>
+
+// TEMPLATE: LEGO1 0x10059950
+// MxCollection<LegoWorld *>::Destroy
+
+// TEMPLATE: LEGO1 0x10059960
+// MxList<LegoWorld *>::~MxList<LegoWorld *>
+
+// SYNTHETIC: LEGO1 0x10059ac0
+// MxCollection<LegoWorld *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10059b30
+// MxList<LegoWorld *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x10059be0
+// MxPtrList<LegoWorld>::`scalar deleting destructor'
+
 #endif // LEGOWORLDLIST_H
diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/mxactionnotificationparam.cpp
index 291156f4..2122ba0d 100644
--- a/LEGO1/mxactionnotificationparam.cpp
+++ b/LEGO1/mxactionnotificationparam.cpp
@@ -14,6 +14,3 @@ MxNotificationParam* MxEndActionNotificationParam::Clone()
 {
 	return new MxEndActionNotificationParam(c_notificationEndAction, this->m_sender, this->m_action, this->m_realloc);
 }
-
-// SYNTHETIC: LEGO1 0x100513a0
-// MxEndActionNotificationParam::`scalar deleting destructor'
diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/mxactionnotificationparam.h
index c5d4316f..cbe73fe2 100644
--- a/LEGO1/mxactionnotificationparam.h
+++ b/LEGO1/mxactionnotificationparam.h
@@ -67,4 +67,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 	virtual MxNotificationParam* Clone() override; // vtable+0x4
 };
 
+// SYNTHETIC: LEGO1 0x100513a0
+// MxEndActionNotificationParam::`scalar deleting destructor'
+
 #endif
diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp
index d21013d4..8c549c88 100644
--- a/LEGO1/mxcompositepresenter.cpp
+++ b/LEGO1/mxcompositepresenter.cpp
@@ -19,24 +19,6 @@ MxCompositePresenter::MxCompositePresenter()
 	NotificationManager()->Register(this);
 }
 
-// TEMPLATE: LEGO1 0x100b61a0
-// list<MxPresenter *,allocator<MxPresenter *> >::~list<MxPresenter *,allocator<MxPresenter *> >
-
-// FUNCTION: LEGO1 0x100b6210
-// MxCompositePresenter::ClassName
-
-// FUNCTION: LEGO1 0x100b6220
-// MxCompositePresenter::IsA
-
-// SYNTHETIC: LEGO1 0x100b62d0
-// MxCompositePresenter::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x100b62f0
-// MxCompositePresenterList::~MxCompositePresenterList
-
-// TEMPLATE: LEGO1 0x100b6340
-// List<MxPresenter *>::~List<MxPresenter *>
-
 // FUNCTION: LEGO1 0x100b6390
 MxCompositePresenter::~MxCompositePresenter()
 {
diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h
index 20b3c347..64a0b236 100644
--- a/LEGO1/mxcompositepresenter.h
+++ b/LEGO1/mxcompositepresenter.h
@@ -15,12 +15,14 @@ class MxCompositePresenter : public MxPresenter {
 
 	virtual MxLong Notify(MxParam& p) override; // vtable+0x04
 
+	// FUNCTION: LEGO1 0x100b6210
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// GLOBAL: LEGO1 0x100f0774
 		return "MxCompositePresenter";
 	}
 
+	// FUNCTION: LEGO1 0x100b6220
 	inline virtual MxBool IsA(const char* name) const override // vtable+0x10
 	{
 		return !strcmp(name, MxCompositePresenter::ClassName()) || MxPresenter::IsA(name);
@@ -40,4 +42,16 @@ class MxCompositePresenter : public MxPresenter {
 	MxCompositePresenterList m_list; // 0x40
 };
 
+// TEMPLATE: LEGO1 0x100b61a0
+// list<MxPresenter *,allocator<MxPresenter *> >::~list<MxPresenter *,allocator<MxPresenter *> >
+
+// SYNTHETIC: LEGO1 0x100b62d0
+// MxCompositePresenter::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x100b62f0
+// MxCompositePresenterList::~MxCompositePresenterList
+
+// TEMPLATE: LEGO1 0x100b6340
+// List<MxPresenter *>::~List<MxPresenter *>
+
 #endif // MXCOMPOSITEPRESENTER_H
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
index 4de691cc..6bae0ddb 100644
--- a/LEGO1/mxcore.h
+++ b/LEGO1/mxcore.h
@@ -8,13 +8,6 @@
 
 class MxParam;
 
-// TODO: Find proper compilation unit to put these
-// FUNCTION: LEGO1 0x100140d0
-// MxCore::IsA
-
-// FUNCTION: LEGO1 0x100144c0
-// MxCore::ClassName
-
 // VTABLE: LEGO1 0x100dc0f8
 // SIZE 0x8
 class MxCore {
@@ -24,12 +17,14 @@ class MxCore {
 	__declspec(dllexport) virtual MxLong Notify(MxParam& p); // vtable+04
 	virtual MxResult Tickle();                               // vtable+08
 
+	// FUNCTION: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
 	{
 		// GLOBAL: LEGO1 0x100f007c
 		return "MxCore";
 	}
 
+	// FUNCTION: LEGO1 0x100140d0
 	inline virtual MxBool IsA(const char* name) const // vtable+10
 	{
 		return !strcmp(name, MxCore::ClassName());
diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp
index 70fdecaa..197ef841 100644
--- a/LEGO1/mxdiskstreamcontroller.cpp
+++ b/LEGO1/mxdiskstreamcontroller.cpp
@@ -13,18 +13,6 @@ MxDiskStreamController::MxDiskStreamController()
 	m_unk8c = 0;
 }
 
-// TEMPLATE: LEGO1 0x100c7330
-// list<MxDSAction *,allocator<MxDSAction *> >::_Buynode
-
-// TEMPLATE: LEGO1 0x100c7420
-// list<MxDSBuffer *,allocator<MxDSBuffer *> >::~list<MxDSBuffer *,allocator<MxDSBuffer *> >
-
-// TEMPLATE: LEGO1 0x100c7490
-// list<MxDSBuffer *,allocator<MxDSBuffer *> >::_Buynode
-
-// TEMPLATE: LEGO1 0x100c74e0
-// List<MxDSBuffer *>::~List<MxDSBuffer *>
-
 // STUB: LEGO1 0x100c7530
 MxDiskStreamController::~MxDiskStreamController()
 {
diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h
index bed571f4..aadb9036 100644
--- a/LEGO1/mxdiskstreamcontroller.h
+++ b/LEGO1/mxdiskstreamcontroller.h
@@ -50,4 +50,16 @@ class MxDiskStreamController : public MxStreamController {
 	undefined m_unkc4;                 // 0xc4
 };
 
+// TEMPLATE: LEGO1 0x100c7330
+// list<MxDSAction *,allocator<MxDSAction *> >::_Buynode
+
+// TEMPLATE: LEGO1 0x100c7420
+// list<MxDSBuffer *,allocator<MxDSBuffer *> >::~list<MxDSBuffer *,allocator<MxDSBuffer *> >
+
+// TEMPLATE: LEGO1 0x100c7490
+// list<MxDSBuffer *,allocator<MxDSBuffer *> >::_Buynode
+
+// TEMPLATE: LEGO1 0x100c74e0
+// List<MxDSBuffer *>::~List<MxDSBuffer *>
+
 #endif // MXDISKSTREAMCONTROLLER_H
diff --git a/LEGO1/mxdsactionlist.cpp b/LEGO1/mxdsactionlist.cpp
index a664f53e..2cfe4a59 100644
--- a/LEGO1/mxdsactionlist.cpp
+++ b/LEGO1/mxdsactionlist.cpp
@@ -17,18 +17,3 @@ void MxDSActionList::Destroy(MxDSAction* p_action)
 	if (p_action)
 		delete p_action;
 }
-
-// TEMPLATE: LEGO1 0x100c9cc0
-// MxCollection<MxDSAction *>::Compare
-
-// TEMPLATE: LEGO1 0x100c9d20
-// MxCollection<MxDSAction *>::Destroy
-
-// TEMPLATE: LEGO1 0x100c9d30
-// MxList<MxDSAction *>::~MxList<MxDSAction *>
-
-// SYNTHETIC: LEGO1 0x100c9e30
-// MxCollection<MxDSAction *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c9ea0
-// MxList<MxDSAction *>::`scalar deleting destructor'
diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/mxdsactionlist.h
index a467bf52..25343785 100644
--- a/LEGO1/mxdsactionlist.h
+++ b/LEGO1/mxdsactionlist.h
@@ -35,4 +35,19 @@ class MxDSActionListCursor : public MxListCursor<MxDSAction*> {
 	MxDSActionListCursor(MxDSActionList* p_list) : MxListCursor<MxDSAction*>(p_list){};
 };
 
+// TEMPLATE: LEGO1 0x100c9cc0
+// MxCollection<MxDSAction *>::Compare
+
+// TEMPLATE: LEGO1 0x100c9d20
+// MxCollection<MxDSAction *>::Destroy
+
+// TEMPLATE: LEGO1 0x100c9d30
+// MxList<MxDSAction *>::~MxList<MxDSAction *>
+
+// SYNTHETIC: LEGO1 0x100c9e30
+// MxCollection<MxDSAction *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c9ea0
+// MxList<MxDSAction *>::`scalar deleting destructor'
+
 #endif // MXDSACTIONLIST_H
diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/mxdsmultiaction.cpp
index b2b31abe..27cd806e 100644
--- a/LEGO1/mxdsmultiaction.cpp
+++ b/LEGO1/mxdsmultiaction.cpp
@@ -2,19 +2,6 @@
 
 DECOMP_SIZE_ASSERT(MxDSMultiAction, 0x9c)
 
-// TODO: Should be moved later
-// SYNTHETIC: LEGO1 0x1004ad10
-// MxDSActionListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x1004ad80
-// MxListCursor<MxDSAction *>::~MxListCursor<MxDSAction *>
-
-// SYNTHETIC: LEGO1 0x1004add0
-// MxListCursor<MxDSAction *>::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x1004ae40
-// MxDSActionListCursor::~MxDSActionListCursor
-
 // FUNCTION: LEGO1 0x100c9b90
 MxDSMultiAction::MxDSMultiAction()
 {
diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/mxdsmultiaction.h
index 267b7a9e..3c5f1eba 100644
--- a/LEGO1/mxdsmultiaction.h
+++ b/LEGO1/mxdsmultiaction.h
@@ -41,4 +41,16 @@ class MxDSMultiAction : public MxDSAction {
 	MxDSActionList* m_actions;
 };
 
+// SYNTHETIC: LEGO1 0x1004ad10
+// MxDSActionListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x1004ad80
+// MxListCursor<MxDSAction *>::~MxListCursor<MxDSAction *>
+
+// SYNTHETIC: LEGO1 0x1004add0
+// MxListCursor<MxDSAction *>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x1004ae40
+// MxDSActionListCursor::~MxDSActionListCursor
+
 #endif // MXDSMULTIACTION_H
diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h
index d4563d9a..5bd7e144 100644
--- a/LEGO1/mxdsobject.h
+++ b/LEGO1/mxdsobject.h
@@ -6,10 +6,6 @@
 #include "mxcore.h"
 #include "mxdstypes.h"
 
-// TODO: Find proper compilation unit to put this
-// FUNCTION: LEGO1 0x10005530
-// MxDSObject::SetAtomId
-
 // VTABLE: LEGO1 0x100dc868
 // SIZE 0x2c
 class MxDSObject : public MxCore {
@@ -63,4 +59,10 @@ class MxDSObject : public MxCore {
 
 MxDSObject* DeserializeDSObjectDispatch(char**, MxS16);
 
+// FUNCTION: ISLE 0x401c40
+// MxDSObject::SetAtomId
+
+// FUNCTION: LEGO1 0x10005530
+// MxDSObject::SetAtomId
+
 #endif // MXDSOBJECT_H
diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/mxdsselectaction.cpp
index ed9b78ba..4bdfbd60 100644
--- a/LEGO1/mxdsselectaction.cpp
+++ b/LEGO1/mxdsselectaction.cpp
@@ -33,18 +33,6 @@ void MxDSSelectAction::CopyFrom(MxDSSelectAction& p_dsSelectAction)
 		this->m_unk0xac->Append(string);
 }
 
-// SYNTHETIC: LEGO1 0x100cbbd0
-// MxStringListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100cbc40
-// MxListCursor<MxString>::~MxListCursor<MxString>
-
-// SYNTHETIC: LEGO1 0x100cbc90
-// MxListCursor<MxString>::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x100cbd00
-// MxStringListCursor::~MxStringListCursor
-
 // FUNCTION: LEGO1 0x100cbd50
 MxDSSelectAction& MxDSSelectAction::operator=(MxDSSelectAction& p_dsSelectAction)
 {
@@ -142,6 +130,3 @@ void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24)
 
 	*p_source += extraFlag;
 }
-
-// TEMPLATE: LEGO1 0x100cc450
-// MxListEntry<MxString>::GetValue
diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h
index 7f57896b..44e40a2a 100644
--- a/LEGO1/mxdsselectaction.h
+++ b/LEGO1/mxdsselectaction.h
@@ -37,4 +37,19 @@ class MxDSSelectAction : public MxDSParallelAction {
 	MxStringList* m_unk0xac;
 };
 
+// SYNTHETIC: LEGO1 0x100cbbd0
+// MxStringListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100cbc40
+// MxListCursor<MxString>::~MxListCursor<MxString>
+
+// SYNTHETIC: LEGO1 0x100cbc90
+// MxListCursor<MxString>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x100cbd00
+// MxStringListCursor::~MxStringListCursor
+
+// TEMPLATE: LEGO1 0x100cc450
+// MxListEntry<MxString>::GetValue
+
 #endif // MXDSSELECTACTION_H
diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/mxloopingmidipresenter.cpp
index 3d58e56b..84b33229 100644
--- a/LEGO1/mxloopingmidipresenter.cpp
+++ b/LEGO1/mxloopingmidipresenter.cpp
@@ -7,15 +7,6 @@
 
 DECOMP_SIZE_ASSERT(MxLoopingMIDIPresenter, 0x58);
 
-// FUNCTION: LEGO1 0x100b1830
-// MxLoopingMIDIPresenter::ClassName
-
-// FUNCTION: LEGO1 0x100b1840
-// MxLoopingMIDIPresenter::IsA
-
-// SYNTHETIC: LEGO1 0x100b19c0
-// MxLoopingMIDIPresenter::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100c2a80
 void MxLoopingMIDIPresenter::StreamingTickle()
 {
diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/mxloopingmidipresenter.h
index 3f393581..a8fe2664 100644
--- a/LEGO1/mxloopingmidipresenter.h
+++ b/LEGO1/mxloopingmidipresenter.h
@@ -7,12 +7,14 @@
 // SIZE 0x58
 class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
+	// FUNCTION: LEGO1 0x100b1830
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
 		// GLOBAL: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x100b1840
 	inline virtual MxBool IsA(const char* name) const override // vtable+0x10
 	{
 		return !strcmp(name, MxLoopingMIDIPresenter::ClassName()) || MxMIDIPresenter::IsA(name);
@@ -23,4 +25,7 @@ class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 	virtual MxResult PutData() override;     // vtable+0x4c
 };
 
+// SYNTHETIC: LEGO1 0x100b19c0
+// MxLoopingMIDIPresenter::`scalar deleting destructor'
+
 #endif // MXLOOPINGMIDIPRESENTER_H
diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp
index 2d18a839..314f89c7 100644
--- a/LEGO1/mxmediapresenter.cpp
+++ b/LEGO1/mxmediapresenter.cpp
@@ -21,19 +21,6 @@ void MxMediaPresenter::Destroy()
 	Destroy(FALSE);
 }
 
-// TODO: These probably belong in another class
-// SYNTHETIC: LEGO1 0x100b46e0
-// MxStreamChunkListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100b4750
-// MxListCursor<MxStreamChunk *>::~MxListCursor<MxStreamChunk *>
-
-// SYNTHETIC: LEGO1 0x100b47a0
-// MxListCursor<MxStreamChunk *>::`scalar deleting destructor'
-
-// FUNCTION: LEGO1 0x100b4810
-// MxStreamChunkListCursor::~MxStreamChunkListCursor
-
 // FUNCTION: LEGO1 0x100b54e0
 void MxMediaPresenter::Init()
 {
diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h
index 85ad612f..8807bcd2 100644
--- a/LEGO1/mxmediapresenter.h
+++ b/LEGO1/mxmediapresenter.h
@@ -49,4 +49,16 @@ class MxMediaPresenter : public MxPresenter {
 	MxStreamChunk* NextChunk();
 };
 
+// SYNTHETIC: LEGO1 0x100b46e0
+// MxStreamChunkListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100b4750
+// MxListCursor<MxStreamChunk *>::~MxListCursor<MxStreamChunk *>
+
+// SYNTHETIC: LEGO1 0x100b47a0
+// MxListCursor<MxStreamChunk *>::`scalar deleting destructor'
+
+// FUNCTION: LEGO1 0x100b4810
+// MxStreamChunkListCursor::~MxStreamChunkListCursor
+
 #endif // MXMEDIAPRESENTER_H
diff --git a/LEGO1/mxpresenterlist.cpp b/LEGO1/mxpresenterlist.cpp
index 6dc0a0f2..adf48262 100644
--- a/LEGO1/mxpresenterlist.cpp
+++ b/LEGO1/mxpresenterlist.cpp
@@ -10,27 +10,3 @@ MxS8 MxPresenterList::Compare(MxPresenter* p_a, MxPresenter* p_b)
 {
 	return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
 }
-
-// TEMPLATE: LEGO1 0x1001cd20
-// MxCollection<MxPresenter *>::Compare
-
-// TEMPLATE: LEGO1 0x1001cd30
-// MxCollection<MxPresenter *>::Destroy
-
-// TEMPLATE: LEGO1 0x1001cd40
-// MxList<MxPresenter *>::MxList<MxPresenter *>
-
-// TEMPLATE: LEGO1 0x1001cdd0
-// MxCollection<MxPresenter *>::~MxCollection<MxPresenter *>
-
-// TEMPLATE: LEGO1 0x1001ce20
-// MxList<MxPresenter *>::~MxList<MxPresenter *>
-
-// SYNTHETIC: LEGO1 0x1001cf70
-// MxCollection<MxPresenter *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001cfe0
-// MxList<MxPresenter *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x1001d090
-// MxPtrList<MxPresenter>::`scalar deleting destructor'
diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/mxpresenterlist.h
index 23e7f6c2..e9ffc398 100644
--- a/LEGO1/mxpresenterlist.h
+++ b/LEGO1/mxpresenterlist.h
@@ -33,4 +33,28 @@ class MxPresenterListCursor : public MxPtrListCursor<MxPresenter> {
 // VTABLE: LEGO1 0x100d6368
 // class MxList<MxPresenter *>
 
+// TEMPLATE: LEGO1 0x1001cd20
+// MxCollection<MxPresenter *>::Compare
+
+// TEMPLATE: LEGO1 0x1001cd30
+// MxCollection<MxPresenter *>::Destroy
+
+// TEMPLATE: LEGO1 0x1001cd40
+// MxList<MxPresenter *>::MxList<MxPresenter *>
+
+// TEMPLATE: LEGO1 0x1001cdd0
+// MxCollection<MxPresenter *>::~MxCollection<MxPresenter *>
+
+// TEMPLATE: LEGO1 0x1001ce20
+// MxList<MxPresenter *>::~MxList<MxPresenter *>
+
+// SYNTHETIC: LEGO1 0x1001cf70
+// MxCollection<MxPresenter *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001cfe0
+// MxList<MxPresenter *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x1001d090
+// MxPtrList<MxPresenter>::`scalar deleting destructor'
+
 #endif // MXPRESENTERLIST_H
diff --git a/LEGO1/mxregion.cpp b/LEGO1/mxregion.cpp
index 0ac28be1..afd546d6 100644
--- a/LEGO1/mxregion.cpp
+++ b/LEGO1/mxregion.cpp
@@ -86,24 +86,6 @@ void MxRegion::vtable18(MxRect32& p_rect)
 	m_rect.UpdateBounds(p_rect);
 }
 
-// SYNTHETIC: LEGO1 0x100c3be0
-// MxRegionListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c3c50
-// MxPtrListCursor<MxRegionTopBottom>::~MxPtrListCursor<MxRegionTopBottom>
-
-// SYNTHETIC: LEGO1 0x100c3ca0
-// MxListCursor<MxRegionTopBottom *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c3d10
-// MxPtrListCursor<MxRegionTopBottom>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c3d80
-// MxListCursor<MxRegionTopBottom *>::~MxListCursor<MxRegionTopBottom *>
-
-// FUNCTION: LEGO1 0x100c3dd0
-// MxRegionListCursor::~MxRegionListCursor
-
 // FUNCTION: LEGO1 0x100c3e20
 MxBool MxRegion::vtable1c(MxRect32& p_rect)
 {
@@ -123,21 +105,6 @@ MxBool MxRegion::vtable1c(MxRect32& p_rect)
 	return FALSE;
 }
 
-// SYNTHETIC: LEGO1 0x100c4790
-// MxRegionLeftRightListCursor::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c4800
-// MxPtrListCursor<MxRegionLeftRight>::~MxPtrListCursor<MxRegionLeftRight>
-
-// SYNTHETIC: LEGO1 0x100c4850
-// MxListCursor<MxRegionLeftRight *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c48c0
-// MxPtrListCursor<MxRegionLeftRight>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c4930
-// MxListCursor<MxRegionLeftRight *>::~MxListCursor<MxRegionLeftRight *>
-
 // FUNCTION: LEGO1 0x100c4c90
 MxRegionTopBottom::MxRegionTopBottom(MxS32 p_top, MxS32 p_bottom)
 {
@@ -200,15 +167,6 @@ void MxRegionTopBottom::FUN_100c5280(MxS32 p_left, MxS32 p_right)
 	}
 }
 
-// TEMPLATE: LEGO1 0x100c54f0
-// MxListCursor<MxRegionLeftRight *>::MxListCursor<MxRegionLeftRight *>
-
-// FUNCTION: LEGO1 0x100c5560
-// MxRegionLeftRightListCursor::~MxRegionLeftRightListCursor
-
-// TEMPLATE: LEGO1 0x100c55b0
-// MxListCursor<MxRegionLeftRight *>::operator=
-
 // FUNCTION: LEGO1 0x100c55d0
 MxRegionTopBottom* MxRegionTopBottom::Clone()
 {
diff --git a/LEGO1/mxregionlist.cpp b/LEGO1/mxregionlist.cpp
index c1abb0e7..f2ae0d29 100644
--- a/LEGO1/mxregionlist.cpp
+++ b/LEGO1/mxregionlist.cpp
@@ -2,12 +2,6 @@
 
 #include "mxregion.h"
 
-// TEMPLATE: LEGO1 0x100c32e0
-// MxCollection<MxRegionTopBottom *>::Compare
-
-// TEMPLATE: LEGO1 0x100c3340
-// MxCollection<MxRegionTopBottom *>::Destroy
-
 // FUNCTION: LEGO1 0x100c33e0
 void MxRegionList::Destroy(MxRegionTopBottom* p_topBottom)
 {
@@ -18,47 +12,8 @@ void MxRegionList::Destroy(MxRegionTopBottom* p_topBottom)
 	}
 }
 
-// SYNTHETIC: LEGO1 0x100c34d0
-// MxCollection<MxRegionTopBottom *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c3540
-// MxList<MxRegionTopBottom *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c35f0
-// MxPtrList<MxRegionTopBottom>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c4d80
-// MxCollection<MxRegionLeftRight *>::Compare
-
-// TEMPLATE: LEGO1 0x100c4de0
-// MxCollection<MxRegionLeftRight *>::Destroy
-
 // FUNCTION: LEGO1 0x100c4e80
 void MxRegionLeftRightList::Destroy(MxRegionLeftRight* p_leftRight)
 {
 	delete p_leftRight;
 }
-
-// SYNTHETIC: LEGO1 0x100c4f50
-// MxCollection<MxRegionLeftRight *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c4fc0
-// MxList<MxRegionLeftRight *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100c5070
-// MxPtrList<MxRegionLeftRight>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100c54f0
-// MxListCursor<MxRegionLeftRight *>::MxListCursor<MxRegionLeftRight *>
-
-// TEMPLATE: LEGO1 0x100c58c0
-// MxList<MxRegionLeftRight *>::_InsertEntry
-
-// TEMPLATE: LEGO1 0x100c5970
-// MxList<MxRegionTopBottom *>::_InsertEntry
-
-// TEMPLATE: LEGO1 0x100c5a20
-// MxListEntry<MxRegionTopBottom *>::MxListEntry<MxRegionTopBottom *>
-
-// TEMPLATE: LEGO1 0x100c5a40
-// MxList<MxRegionLeftRight *>::_DeleteEntry
diff --git a/LEGO1/mxregionlist.h b/LEGO1/mxregionlist.h
index 2938e38b..21bb3c23 100644
--- a/LEGO1/mxregionlist.h
+++ b/LEGO1/mxregionlist.h
@@ -68,4 +68,88 @@ class MxRegionLeftRightListCursor : public MxPtrListCursor<MxRegionLeftRight> {
 	MxRegionLeftRightListCursor(MxRegionLeftRightList* p_list) : MxPtrListCursor<MxRegionLeftRight>(p_list){};
 };
 
+// TEMPLATE: LEGO1 0x100c32e0
+// MxCollection<MxRegionTopBottom *>::Compare
+
+// TEMPLATE: LEGO1 0x100c3340
+// MxCollection<MxRegionTopBottom *>::Destroy
+
+// SYNTHETIC: LEGO1 0x100c34d0
+// MxCollection<MxRegionTopBottom *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c3540
+// MxList<MxRegionTopBottom *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c35f0
+// MxPtrList<MxRegionTopBottom>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c3be0
+// MxRegionListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100c3c50
+// MxPtrListCursor<MxRegionTopBottom>::~MxPtrListCursor<MxRegionTopBottom>
+
+// SYNTHETIC: LEGO1 0x100c3ca0
+// MxListCursor<MxRegionTopBottom *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c3d10
+// MxPtrListCursor<MxRegionTopBottom>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100c3d80
+// MxListCursor<MxRegionTopBottom *>::~MxListCursor<MxRegionTopBottom *>
+
+// FUNCTION: LEGO1 0x100c3dd0
+// MxRegionListCursor::~MxRegionListCursor
+
+// SYNTHETIC: LEGO1 0x100c4790
+// MxRegionLeftRightListCursor::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100c4800
+// MxPtrListCursor<MxRegionLeftRight>::~MxPtrListCursor<MxRegionLeftRight>
+
+// SYNTHETIC: LEGO1 0x100c4850
+// MxListCursor<MxRegionLeftRight *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c48c0
+// MxPtrListCursor<MxRegionLeftRight>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100c4930
+// MxListCursor<MxRegionLeftRight *>::~MxListCursor<MxRegionLeftRight *>
+
+// TEMPLATE: LEGO1 0x100c4d80
+// MxCollection<MxRegionLeftRight *>::Compare
+
+// TEMPLATE: LEGO1 0x100c4de0
+// MxCollection<MxRegionLeftRight *>::Destroy
+
+// SYNTHETIC: LEGO1 0x100c4f50
+// MxCollection<MxRegionLeftRight *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c4fc0
+// MxList<MxRegionLeftRight *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100c5070
+// MxPtrList<MxRegionLeftRight>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100c54f0
+// MxListCursor<MxRegionLeftRight *>::MxListCursor<MxRegionLeftRight *>
+
+// FUNCTION: LEGO1 0x100c5560
+// MxRegionLeftRightListCursor::~MxRegionLeftRightListCursor
+
+// TEMPLATE: LEGO1 0x100c55b0
+// MxListCursor<MxRegionLeftRight *>::operator=
+
+// TEMPLATE: LEGO1 0x100c58c0
+// MxList<MxRegionLeftRight *>::_InsertEntry
+
+// TEMPLATE: LEGO1 0x100c5970
+// MxList<MxRegionTopBottom *>::_InsertEntry
+
+// TEMPLATE: LEGO1 0x100c5a20
+// MxListEntry<MxRegionTopBottom *>::MxListEntry<MxRegionTopBottom *>
+
+// TEMPLATE: LEGO1 0x100c5a40
+// MxList<MxRegionLeftRight *>::_DeleteEntry
+
 #endif // MXREGIONLIST_H
diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/mxsoundmanager.cpp
index 73555515..b212f9b4 100644
--- a/LEGO1/mxsoundmanager.cpp
+++ b/LEGO1/mxsoundmanager.cpp
@@ -15,9 +15,6 @@ MxSoundManager::MxSoundManager()
 	Init();
 }
 
-// SYNTHETIC: LEGO1 0x100ae7b0
-// MxSoundManager::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100ae7d0
 MxSoundManager::~MxSoundManager()
 {
diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/mxsoundmanager.h
index b804ef23..9677e543 100644
--- a/LEGO1/mxsoundmanager.h
+++ b/LEGO1/mxsoundmanager.h
@@ -34,4 +34,7 @@ class MxSoundManager : public MxAudioManager {
 	undefined m_unk38[4];
 };
 
+// SYNTHETIC: LEGO1 0x100ae7b0
+// MxSoundManager::`scalar deleting destructor'
+
 #endif // MXSOUNDMANAGER_H
diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/mxstillpresenter.cpp
index 278b24cf..c608ec84 100644
--- a/LEGO1/mxstillpresenter.cpp
+++ b/LEGO1/mxstillpresenter.cpp
@@ -22,15 +22,6 @@ void MxStillPresenter::Destroy()
 	Destroy(FALSE);
 }
 
-// FUNCTION: LEGO1 0x100435c0
-// MxStillPresenter::ClassName
-
-// FUNCTION: LEGO1 0x100435d0
-// MxStillPresenter::IsA
-
-// SYNTHETIC: LEGO1 0x100436e0
-// MxStillPresenter::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100b9c70
 void MxStillPresenter::Destroy(MxBool p_fromDestructor)
 {
diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/mxstillpresenter.h
index 6f434faa..3441827a 100644
--- a/LEGO1/mxstillpresenter.h
+++ b/LEGO1/mxstillpresenter.h
@@ -11,12 +11,14 @@ class MxStillPresenter : public MxVideoPresenter {
 	MxStillPresenter() { m_bitmapInfo = NULL; }
 	virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
 
+	// FUNCTION: LEGO1 0x100435c0
 	inline virtual const char* ClassName() const override // vtable+0xc
 	{
 		// GLOBAL: LEGO1 0x100f0184
 		return "MxStillPresenter";
 	}
 
+	// FUNCTION: LEGO1 0x100435d0
 	inline virtual MxBool IsA(const char* name) const override // vtable+0x10
 	{
 		return !strcmp(name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(name);
@@ -43,4 +45,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	MxBITMAPINFO* m_bitmapInfo; // 0x68
 };
 
+// SYNTHETIC: LEGO1 0x100436e0
+// MxStillPresenter::`scalar deleting destructor'
+
 #endif // MXSTILLPRESENTER_H
diff --git a/LEGO1/mxstreamchunklist.cpp b/LEGO1/mxstreamchunklist.cpp
index 3c4bee9c..b268c4ad 100644
--- a/LEGO1/mxstreamchunklist.cpp
+++ b/LEGO1/mxstreamchunklist.cpp
@@ -17,18 +17,3 @@ void MxStreamChunkList::Destroy(MxStreamChunk* p_chunk)
 	if (p_chunk)
 		delete p_chunk;
 }
-
-// TEMPLATE: LEGO1 0x100b5930
-// MxCollection<MxStreamChunk *>::Compare
-
-// TEMPLATE: LEGO1 0x100b5990
-// MxCollection<MxStreamChunk *>::Destroy
-
-// TEMPLATE: LEGO1 0x100b59a0
-// MxList<MxStreamChunk *>::~MxList<MxStreamChunk *>
-
-// SYNTHETIC: LEGO1 0x100b5aa0
-// MxCollection<MxStreamChunk *>::`scalar deleting destructor'
-
-// SYNTHETIC: LEGO1 0x100b5b10
-// MxList<MxStreamChunk *>::`scalar deleting destructor'
diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/mxstreamchunklist.h
index 9661229c..154a091b 100644
--- a/LEGO1/mxstreamchunklist.h
+++ b/LEGO1/mxstreamchunklist.h
@@ -32,4 +32,19 @@ class MxStreamChunkListCursor : public MxListCursor<MxStreamChunk*> {
 // VTABLE: LEGO1 0x100dc528
 // class MxListCursor<MxStreamChunk *>
 
+// TEMPLATE: LEGO1 0x100b5930
+// MxCollection<MxStreamChunk *>::Compare
+
+// TEMPLATE: LEGO1 0x100b5990
+// MxCollection<MxStreamChunk *>::Destroy
+
+// TEMPLATE: LEGO1 0x100b59a0
+// MxList<MxStreamChunk *>::~MxList<MxStreamChunk *>
+
+// SYNTHETIC: LEGO1 0x100b5aa0
+// MxCollection<MxStreamChunk *>::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100b5b10
+// MxList<MxStreamChunk *>::`scalar deleting destructor'
+
 #endif // MXSTREAMCHUNKLIST_H
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index cdc8eff3..b6ed532b 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -34,50 +34,6 @@ MxStreamController::MxStreamController()
 	m_action0x60 = NULL;
 }
 
-// TEMPLATE: LEGO1 0x100c0d60
-// list<MxDSAction *,allocator<MxDSAction *> >::~list<MxDSAction *,allocator<MxDSAction *> >
-
-// TEMPLATE: LEGO1 0x100c0dd0
-// list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::~list<MxDSSubscriber *,allocator<MxDSSubscriber *> >
-
-// TEMPLATE: LEGO1 0x100c0e40
-// list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::_Buynode
-
-// clang-format off
-// TEMPLATE: LEGO1 0x100c0e70
-// list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::~list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >
-// clang-format on
-
-// TEMPLATE: LEGO1 0x100c0ee0
-// list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::_Buynode
-
-// FUNCTION: LEGO1 0x100c0fc0
-// MxStreamListMxDSSubscriber::~MxStreamListMxDSSubscriber
-
-// FUNCTION: LEGO1 0x100c1010
-// MxStreamListMxDSAction::~MxStreamListMxDSAction
-
-// FUNCTION: LEGO1 0x100c1060
-// MxStreamListMxNextActionDataStart::~MxStreamListMxNextActionDataStart
-
-// TEMPLATE: LEGO1 0x100c10b0
-// MxStreamList<MxDSSubscriber *>::~MxStreamList<MxDSSubscriber *>
-
-// TEMPLATE: LEGO1 0x100c1100
-// MxStreamList<MxDSAction *>::~MxStreamList<MxDSAction *>
-
-// TEMPLATE: LEGO1 0x100c1150
-// MxStreamList<MxNextActionDataStart *>::~MxStreamList<MxNextActionDataStart *>
-
-// TEMPLATE: LEGO1 0x100c11a0
-// List<MxDSSubscriber *>::~List<MxDSSubscriber *>
-
-// TEMPLATE: LEGO1 0x100c11f0
-// List<MxDSAction *>::~List<MxDSAction *>
-
-// TEMPLATE: LEGO1 0x100c1240
-// List<MxNextActionDataStart *>::~List<MxNextActionDataStart *>
-
 // STUB: LEGO1 0x100c1290
 MxStreamController::~MxStreamController()
 {
diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/mxstreamcontroller.h
index 80ff9e35..7db46f87 100644
--- a/LEGO1/mxstreamcontroller.h
+++ b/LEGO1/mxstreamcontroller.h
@@ -59,4 +59,48 @@ class MxStreamController : public MxCore {
 	MxDSAction* m_action0x60;                           // 0x60
 };
 
+// TEMPLATE: LEGO1 0x100c0d60
+// list<MxDSAction *,allocator<MxDSAction *> >::~list<MxDSAction *,allocator<MxDSAction *> >
+
+// TEMPLATE: LEGO1 0x100c0dd0
+// list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::~list<MxDSSubscriber *,allocator<MxDSSubscriber *> >
+
+// TEMPLATE: LEGO1 0x100c0e40
+// list<MxDSSubscriber *,allocator<MxDSSubscriber *> >::_Buynode
+
+// clang-format off
+// TEMPLATE: LEGO1 0x100c0e70
+// list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::~list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >
+// clang-format on
+
+// TEMPLATE: LEGO1 0x100c0ee0
+// list<MxNextActionDataStart *,allocator<MxNextActionDataStart *> >::_Buynode
+
+// FUNCTION: LEGO1 0x100c0fc0
+// MxStreamListMxDSSubscriber::~MxStreamListMxDSSubscriber
+
+// FUNCTION: LEGO1 0x100c1010
+// MxStreamListMxDSAction::~MxStreamListMxDSAction
+
+// FUNCTION: LEGO1 0x100c1060
+// MxStreamListMxNextActionDataStart::~MxStreamListMxNextActionDataStart
+
+// TEMPLATE: LEGO1 0x100c10b0
+// MxStreamList<MxDSSubscriber *>::~MxStreamList<MxDSSubscriber *>
+
+// TEMPLATE: LEGO1 0x100c1100
+// MxStreamList<MxDSAction *>::~MxStreamList<MxDSAction *>
+
+// TEMPLATE: LEGO1 0x100c1150
+// MxStreamList<MxNextActionDataStart *>::~MxStreamList<MxNextActionDataStart *>
+
+// TEMPLATE: LEGO1 0x100c11a0
+// List<MxDSSubscriber *>::~List<MxDSSubscriber *>
+
+// TEMPLATE: LEGO1 0x100c11f0
+// List<MxDSAction *>::~List<MxDSAction *>
+
+// TEMPLATE: LEGO1 0x100c1240
+// List<MxNextActionDataStart *>::~List<MxNextActionDataStart *>
+
 #endif // MXSTREAMCONTROLLER_H
diff --git a/LEGO1/mxstringlist.cpp b/LEGO1/mxstringlist.cpp
index 1c839a85..8a0a2ddc 100644
--- a/LEGO1/mxstringlist.cpp
+++ b/LEGO1/mxstringlist.cpp
@@ -3,24 +3,3 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(MxListEntry<MxString>, 0x18)
-
-// TEMPLATE: LEGO1 0x100cb3c0
-// MxCollection<MxString>::Compare
-
-// TEMPLATE: LEGO1 0x100cb470
-// MxCollection<MxString>::Destroy
-
-// TEMPLATE: LEGO1 0x100cb4c0
-// MxList<MxString>::~MxList<MxString>
-
-// TEMPLATE: LEGO1 0x100cbb40
-// MxList<MxString>::Append
-
-// TEMPLATE: LEGO1 0x100cc2d0
-// MxList<MxString>::_InsertEntry
-
-// TEMPLATE: LEGO1 0x100cc3c0
-// MxListEntry<MxString>::MxListEntry<MxString>
-
-// TEMPLATE: LEGO1 0x100cc450
-// MxListEntry<MxString>::GetValue
diff --git a/LEGO1/mxstringlist.h b/LEGO1/mxstringlist.h
index cacb0be5..3b105d32 100644
--- a/LEGO1/mxstringlist.h
+++ b/LEGO1/mxstringlist.h
@@ -17,4 +17,25 @@ class MxStringListCursor : public MxListCursor<MxString> {
 // VTABLE: LEGO1 0x100dd070
 // class MxListCursor<MxString>
 
+// TEMPLATE: LEGO1 0x100cb3c0
+// MxCollection<MxString>::Compare
+
+// TEMPLATE: LEGO1 0x100cb470
+// MxCollection<MxString>::Destroy
+
+// TEMPLATE: LEGO1 0x100cb4c0
+// MxList<MxString>::~MxList<MxString>
+
+// TEMPLATE: LEGO1 0x100cbb40
+// MxList<MxString>::Append
+
+// TEMPLATE: LEGO1 0x100cc2d0
+// MxList<MxString>::_InsertEntry
+
+// TEMPLATE: LEGO1 0x100cc3c0
+// MxListEntry<MxString>::MxListEntry<MxString>
+
+// TEMPLATE: LEGO1 0x100cc450
+// MxListEntry<MxString>::GetValue
+
 #endif // MXSTRINGLIST_H
diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/mxvariabletable.cpp
index dda73bee..d7c6f54f 100644
--- a/LEGO1/mxvariabletable.cpp
+++ b/LEGO1/mxvariabletable.cpp
@@ -1,29 +1,5 @@
 #include "mxvariabletable.h"
 
-// TEMPLATE: LEGO1 0x100afcd0
-// MxCollection<MxVariable *>::Compare
-
-// TEMPLATE: LEGO1 0x100afce0
-// MxCollection<MxVariable *>::~MxCollection<MxVariable *>
-
-// TEMPLATE: LEGO1 0x100afd30
-// MxCollection<MxVariable *>::Destroy
-
-// SYNTHETIC: LEGO1 0x100afd40
-// MxCollection<MxVariable *>::`scalar deleting destructor'
-
-// TEMPLATE: LEGO1 0x100afdb0
-// MxVariableTable::Destroy
-
-// TEMPLATE: LEGO1 0x100afdc0
-// MxHashTable<MxVariable *>::Hash
-
-// TEMPLATE: LEGO1 0x100b0bd0
-// MxHashTable<MxVariable *>::~MxHashTable<MxVariable *>
-
-// SYNTHETIC: LEGO1 0x100b0ca0
-// MxHashTable<MxVariable *>::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100b7330
 MxS8 MxVariableTable::Compare(MxVariable* p_var0, MxVariable* p_var1)
 {
@@ -88,9 +64,3 @@ const char* MxVariableTable::GetVariable(const char* p_key)
 
 	return value;
 }
-
-// TEMPLATE: LEGO1 0x100b7ab0
-// MxHashTable<MxVariable *>::Resize
-
-// TEMPLATE: LEGO1 0x100b7b80
-// MxHashTable<MxVariable *>::_NodeInsert
diff --git a/LEGO1/mxvariabletable.h b/LEGO1/mxvariabletable.h
index 1a91da26..b8e831c9 100644
--- a/LEGO1/mxvariabletable.h
+++ b/LEGO1/mxvariabletable.h
@@ -26,4 +26,34 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
 // VTABLE: LEGO1 0x100dc1e8
 // class MxHashTable<MxVariable *>
 
+// TEMPLATE: LEGO1 0x100afcd0
+// MxCollection<MxVariable *>::Compare
+
+// TEMPLATE: LEGO1 0x100afce0
+// MxCollection<MxVariable *>::~MxCollection<MxVariable *>
+
+// TEMPLATE: LEGO1 0x100afd30
+// MxCollection<MxVariable *>::Destroy
+
+// SYNTHETIC: LEGO1 0x100afd40
+// MxCollection<MxVariable *>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100afdb0
+// MxVariableTable::Destroy
+
+// TEMPLATE: LEGO1 0x100afdc0
+// MxHashTable<MxVariable *>::Hash
+
+// TEMPLATE: LEGO1 0x100b0bd0
+// MxHashTable<MxVariable *>::~MxHashTable<MxVariable *>
+
+// SYNTHETIC: LEGO1 0x100b0ca0
+// MxHashTable<MxVariable *>::`scalar deleting destructor'
+
+// TEMPLATE: LEGO1 0x100b7ab0
+// MxHashTable<MxVariable *>::Resize
+
+// TEMPLATE: LEGO1 0x100b7b80
+// MxHashTable<MxVariable *>::_NodeInsert
+
 #endif // MXVARIABLETABLE_H
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index ded96918..a3d7f3e7 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -3,10 +3,6 @@
 
 #include <vec.h>
 
-// TODO: Find proper compilation unit to put this
-// FUNCTION: LEGO1 0x1000c0f0
-// Vector2Impl::Vector2Impl
-
 /*
  * A simple array of three floats that can be indexed into.
  */
@@ -64,6 +60,7 @@ struct Vector4 {
 // SIZE 0x8
 class Vector2Impl {
 public:
+	// FUNCTION: LEGO1 0x1000c0f0
 	inline Vector2Impl(float* p_data) { this->SetData(p_data); }
 
 	// vtable + 0x00 (no virtual destructor)
diff --git a/LEGO1/tgl/d3drm/camera.cpp b/LEGO1/tgl/d3drm/camera.cpp
index 08aea939..5084c2ca 100644
--- a/LEGO1/tgl/d3drm/camera.cpp
+++ b/LEGO1/tgl/d3drm/camera.cpp
@@ -5,9 +5,6 @@ using namespace TglImpl;
 DECOMP_SIZE_ASSERT(Camera, 0x4);
 DECOMP_SIZE_ASSERT(CameraImpl, 0x8);
 
-// SYNTHETIC: LEGO1 0x100a2560
-// TglImpl::CameraImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a36f0
 void* CameraImpl::ImplementationDataPtr()
 {
diff --git a/LEGO1/tgl/d3drm/device.cpp b/LEGO1/tgl/d3drm/device.cpp
index 44307268..b991d417 100644
--- a/LEGO1/tgl/d3drm/device.cpp
+++ b/LEGO1/tgl/d3drm/device.cpp
@@ -4,9 +4,6 @@
 
 using namespace TglImpl;
 
-// SYNTHETIC: LEGO1 0x100a22c0
-// TglImpl::DeviceImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a2bf0
 void* DeviceImpl::ImplementationDataPtr()
 {
diff --git a/LEGO1/tgl/d3drm/group.cpp b/LEGO1/tgl/d3drm/group.cpp
index 4e6bed96..022dc757 100644
--- a/LEGO1/tgl/d3drm/group.cpp
+++ b/LEGO1/tgl/d3drm/group.cpp
@@ -2,9 +2,6 @@
 
 using namespace TglImpl;
 
-// SYNTHETIC: LEGO1 0x100a2480
-// TglImpl::GroupImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a31d0
 void* GroupImpl::ImplementationDataPtr()
 {
@@ -109,13 +106,13 @@ Result GroupImpl::Remove(const Mesh* pMesh)
 	return ResultVal(m_data->DeleteVisual(pMeshImpl->ImplementationData()->groupMesh));
 }
 
-// FUNCTION: LEGO1 0x100a34b0 STUB
+// STUB: LEGO1 0x100a34b0
 Result GroupImpl::RemoveAll()
 {
 	return Error;
 }
 
-// FUNCTION: LEGO1 0x100a34c0 STUB
+// STUB: LEGO1 0x100a34c0
 Result GroupImpl::Unknown()
 {
 	return Error;
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index bbc7baa0..6e2c998a 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -464,4 +464,34 @@ inline D3DRMMATRIX4D* Translate(const FloatMatrix4& tglMatrix4x4, D3DRMMATRIX4D&
 	return &rD3DRMMatrix4x4;
 }
 
+// SYNTHETIC: LEGO1 0x100a16d0
+// TglImpl::RendererImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a22c0
+// TglImpl::DeviceImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a23a0
+// TglImpl::ViewImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a2480
+// TglImpl::GroupImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a2560
+// TglImpl::CameraImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a2640
+// TglImpl::LightImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a2720
+// TglImpl::UnkImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a2800
+// TglImpl::TextureImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100a3d80
+// TglImpl::MeshImpl::`scalar deleting destructor'
+
+// SYNTHETIC: LEGO1 0x100aa250
+// ViewROI::`scalar deleting destructor'
+
 } /* namespace TglImpl */
diff --git a/LEGO1/tgl/d3drm/light.cpp b/LEGO1/tgl/d3drm/light.cpp
index 2f62c4e6..5ceafa4b 100644
--- a/LEGO1/tgl/d3drm/light.cpp
+++ b/LEGO1/tgl/d3drm/light.cpp
@@ -5,9 +5,6 @@ using namespace TglImpl;
 DECOMP_SIZE_ASSERT(Light, 0x4);
 DECOMP_SIZE_ASSERT(LightImpl, 0x8);
 
-// SYNTHETIC: LEGO1 0x100a2640
-// TglImpl::LightImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a3770
 void* LightImpl::ImplementationDataPtr()
 {
diff --git a/LEGO1/tgl/d3drm/mesh.cpp b/LEGO1/tgl/d3drm/mesh.cpp
index d29ff2b3..f044d512 100644
--- a/LEGO1/tgl/d3drm/mesh.cpp
+++ b/LEGO1/tgl/d3drm/mesh.cpp
@@ -7,9 +7,6 @@ DECOMP_SIZE_ASSERT(D3DRMVERTEX, 0x24);
 DECOMP_SIZE_ASSERT(Mesh, 0x4);
 DECOMP_SIZE_ASSERT(MeshImpl, 0x8);
 
-// SYNTHETIC: LEGO1 0x100a3d80
-// TglImpl::MeshImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a3ed0
 void* MeshImpl::ImplementationDataPtr()
 {
diff --git a/LEGO1/tgl/d3drm/renderer.cpp b/LEGO1/tgl/d3drm/renderer.cpp
index 92d80d83..d098f7ff 100644
--- a/LEGO1/tgl/d3drm/renderer.cpp
+++ b/LEGO1/tgl/d3drm/renderer.cpp
@@ -13,9 +13,6 @@ Renderer* Tgl::CreateRenderer()
 	return renderer;
 }
 
-// SYNTHETIC: LEGO1 0x100a16d0
-// TglImpl::RendererImpl::`scalar deleting destructor'
-
 // GLOBAL: LEGO1 0x1010103c
 IDirect3DRM* g_pD3DRM = NULL;
 
diff --git a/LEGO1/tgl/d3drm/texture.cpp b/LEGO1/tgl/d3drm/texture.cpp
index 5b733eae..2b2c3eb0 100644
--- a/LEGO1/tgl/d3drm/texture.cpp
+++ b/LEGO1/tgl/d3drm/texture.cpp
@@ -86,7 +86,7 @@ void TglD3DRMIMAGE::Destroy()
 	delete m_image.palette;
 }
 
-// FUNCTION: LEGO1 0x100a13e0 STUB
+// STUB: LEGO1 0x100a13e0
 Result TglD3DRMIMAGE::CreateBuffer(int width, int height, int depth, void* pBuffer, int useBuffer)
 {
 	return Error;
@@ -126,9 +126,6 @@ Result TglD3DRMIMAGE::InitializePalette(int paletteSize, PaletteEntry* pEntries)
 	return Success;
 }
 
-// SYNTHETIC: LEGO1 0x100a2800
-// TglImpl::TextureImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a3c10
 Result TextureImpl::SetTexels(int width, int height, int bitsPerTexel, void* pTexels)
 {
diff --git a/LEGO1/tgl/d3drm/unk.cpp b/LEGO1/tgl/d3drm/unk.cpp
index 05785b2e..debc1484 100644
--- a/LEGO1/tgl/d3drm/unk.cpp
+++ b/LEGO1/tgl/d3drm/unk.cpp
@@ -5,16 +5,13 @@ using namespace TglImpl;
 DECOMP_SIZE_ASSERT(Unk, 0x4);
 DECOMP_SIZE_ASSERT(UnkImpl, 0x8);
 
-// SYNTHETIC: LEGO1 0x100a2720
-// TglImpl::UnkImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a3830
 void* UnkImpl::ImplementationDataPtr()
 {
 	return reinterpret_cast<void*>(&m_data);
 }
 
-// FUNCTION: LEGO1 0x100a3840 STUB
+// STUB: LEGO1 0x100a3840
 Result UnkImpl::SetMeshData(
 	unsigned long faceCount,
 	unsigned long vertexCount,
diff --git a/LEGO1/tgl/d3drm/view.cpp b/LEGO1/tgl/d3drm/view.cpp
index 116c2b98..f8302bc2 100644
--- a/LEGO1/tgl/d3drm/view.cpp
+++ b/LEGO1/tgl/d3drm/view.cpp
@@ -119,9 +119,6 @@ inline IDirect3DRMFrame* ViewportGetLightFrame(IDirect3DRMViewport* pViewport)
 	return ViewportGetData(pViewport)->m_pLightFrame;
 }
 
-// SYNTHETIC: LEGO1 0x100a23a0
-// TglImpl::ViewImpl::`scalar deleting destructor'
-
 // FUNCTION: LEGO1 0x100a2d80
 void* ViewImpl::ImplementationDataPtr()
 {
diff --git a/LEGO1/viewmanager/viewroi.cpp b/LEGO1/viewmanager/viewroi.cpp
index 47cb71e8..a15f1e2e 100644
--- a/LEGO1/viewmanager/viewroi.cpp
+++ b/LEGO1/viewmanager/viewroi.cpp
@@ -34,8 +34,6 @@ void ViewROI::UpdateWorldData(const Matrix4Data& parent2world)
 	}
 }
 
-// SYNTHETIC: LEGO1 0x100aa250
-// ViewROI::`scalar deleting destructor'
 inline ViewROI::~ViewROI()
 {
 	// SetLODList() will decrease refCount of LODList