From 124711f58433b21e9cf9ecc656c97c1db7c97b23 Mon Sep 17 00:00:00 2001
From: water111 <awaterford111445@gmail.com>
Date: Sun, 26 Jul 2026 14:55:16 -0400
Subject: [PATCH] remove pointless comments

---
 goal_src/jak1/engine/anim/aligner.gc          |   8 -
 goal_src/jak1/engine/camera/cam-debug.gc      |  59 ------
 goal_src/jak1/engine/camera/cam-interface.gc  |  10 -
 goal_src/jak1/engine/collide/collide-cache.gc |   4 -
 goal_src/jak1/engine/game/effect-control.gc   |  20 --
 goal_src/jak1/engine/gfx/background/wind.gc   |   3 -
 goal_src/jak1/engine/gfx/ocean/ocean-mid.gc   |   2 -
 goal_src/jak1/engine/gfx/ocean/ocean.gc       |   1 -
 .../jak1/engine/gfx/tfrag/tfrag-methods.gc    |  52 -----
 goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc  |   3 -
 goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc  |   1 -
 goal_src/jak1/engine/gfx/tfrag/tfrag.gc       |  24 ---
 goal_src/jak1/engine/gfx/tie/tie.gc           |  30 ---
 goal_src/jak1/engine/nav/navigate.gc          | 189 ------------------
 goal_src/jak1/levels/beach/pelican.gc         |   1 -
 .../jak1/levels/finalboss/robotboss-part.gc   | 182 -----------------
 goal_src/jak1/levels/sunken/sunken-part2.gc   |  80 --------
 goal_src/jak1/levels/sunken/sunken-part3.gc   |  57 ------
 goal_src/jak1/levels/sunken/sunken-part4.gc   | 109 ----------
 goal_src/jak1/levels/sunken/sunken-part5.gc   |  60 ------
 .../jak1/levels/village2/village2-part2.gc    | 115 -----------
 goal_src/jak1/old/cavegeyserrock.gc           |  40 ----
 22 files changed, 1050 deletions(-)

diff --git a/goal_src/jak1/engine/anim/aligner.gc b/goal_src/jak1/engine/anim/aligner.gc
index 3da4fa8a08..51fde3fbde 100644
--- a/goal_src/jak1/engine/anim/aligner.gc
+++ b/goal_src/jak1/engine/anim/aligner.gc
@@ -13,8 +13,6 @@
 ;; jump. matrix and transform use index zero for the current sample and index one for the previous
 ;; sample.
 
-;; definition for method 9 of type align-control
-;; INFO: Used lq/sq
 (defmethod compute-alignment! ((this align-control))
   "Sample the skeleton's alignment joint and return its translation, scale, and rotation change
    since the previous sample. Disable application for a missing or changed animation, a loop wrap, or
@@ -96,18 +94,14 @@
       (quaternion-normalize! (quaternion*! (-> this delta quat) inverse-previous-rotation (-> this align quat))))
     (-> this delta)))
 
-;; definition for method 12 of type align-control
-;; INFO: Return type mismatch (inline-array transform) vs transform.
 (defmethod first-transform ((this align-control))
   "Return the current alignment-joint transform."
   (the-as transform (-> this transform)))
 
-;; definition for method 13 of type align-control
 (defmethod snd-transform ((this align-control))
   "Return the previous alignment-joint transform."
   (-> this transform 1))
 
-;; definition for method 10 of type align-control
 (defmethod align! ((this align-control) (options align-opts) (x-scale float) (y-scale float) (z-scale float))
   "Apply the sampled animation-root delta through the owning process's apply-alignment method.
    options selects the velocity axes and rotation; x-scale, y-scale, and z-scale independently scale
@@ -124,7 +118,6 @@
       (apply-alignment-method owner options alignment-delta motion-scale)))
   (-> this process root))
 
-;; definition for method 26 of type trsqv
 (defmethod set-and-limit-velocity ((this trsqv) (flags int) (desired-travel vector) (max-speed float))
   "When flags includes bit four, copy desired-travel's XZ direction into this transform's
    velocity and set its speed to the smaller of desired-travel's length converted to per-second speed
@@ -137,7 +130,6 @@
         (vector-xz-normalize! velocity limited-speed))))
   this)
 
-;; definition for method 11 of type align-control
 (defmethod align-vel-and-quat-only! ((this align-control) (options align-opts) (desired-travel vector) (unused int) (y-scale float) (animation-speed-scale float))
   "Apply selected parts of the sampled root motion directly to the process root. The Y velocity
    uses y-scale. XZ follows desired-travel, with per-frame distance limited by both desired-travel's
diff --git a/goal_src/jak1/engine/camera/cam-debug.gc b/goal_src/jak1/engine/camera/cam-debug.gc
index b5972f313e..0f064fba57 100644
--- a/goal_src/jak1/engine/camera/cam-debug.gc
+++ b/goal_src/jak1/engine/camera/cam-debug.gc
@@ -14,34 +14,26 @@
 ;; this file is debug only
 (declare-file (debug))
 
-;; failed to figure out what this is:
 (when (or (not *camera-old-cpu*) (zero? *camera-old-cpu*))
   (set! *camera-old-cpu* 0)
   0)
 
-;; failed to figure out what this is:
 (when (or (not *camera-old-vu*) (zero? *camera-old-vu*))
   (set! *camera-old-vu* 0)
   0)
 
-;; failed to figure out what this is:
 (when (or (not *camera-old-tfrag-bytes*) (zero? *camera-old-tfrag-bytes*))
   (set! *camera-old-tfrag-bytes* 0)
   0)
 
-;; definition (perm) for symbol *camera-old-level*, type string
 (define-perm *camera-old-level* string (new 'global 'string 128 (the-as string #f)))
 
-;; definition (perm) for symbol *camera-old-stat-string-tfrag*, type string
 (define-perm *camera-old-stat-string-tfrag* string (new 'global 'string 128 (the-as string #f)))
 
-;; definition (perm) for symbol *camera-old-stat-string-tfrag-near*, type string
 (define-perm *camera-old-stat-string-tfrag-near* string (new 'global 'string 128 (the-as string #f)))
 
-;; definition (perm) for symbol *camera-old-stat-string-total*, type string
 (define-perm *camera-old-stat-string-total* string (new 'global 'string 128 (the-as string #f)))
 
-;; definition of type cam-dbg-scratch
 (deftype cam-dbg-scratch (structure)
   ((linevec4w      vector4w 2 :inline :offset-assert 0)
    (color          vector :inline :offset-assert 32)
@@ -63,7 +55,6 @@
   :size-assert #x1d0
   :flag-assert #x9000001d0)
 
-;; definition for method 3 of type cam-dbg-scratch
 (defmethod inspect ((obj cam-dbg-scratch))
   (format #t "[~8x] ~A~%" obj 'cam-dbg-scratch)
   (format #t "~Tlinevec4w[2] @ #x~X~%" (-> obj linevec4w))
@@ -84,8 +75,6 @@
   (format #t "~Tfov-horz: ~`vector`P~%" (-> obj fov-horz))
   obj)
 
-;; definition for function cam-slave-options->string
-;; INFO: Return type mismatch object vs string.
 (defun cam-slave-options->string ((options cam-slave-options) (output object))
   "Append the names of the enabled camera-slave option bits to output and
    return output as a string."
@@ -117,8 +106,6 @@
   (if (= (logand options (cam-slave-options BUTT_CAM)) (cam-slave-options BUTT_CAM)) (format output "BUTT_CAM "))
   (the-as string output))
 
-;; definition for function cam-index-options->string
-;; INFO: Return type mismatch object vs string.
 (defun cam-index-options->string ((options cam-index-options) (output object))
   "Append the historical labels for the enabled camera-index option bits to
    output. These strings are opposite the current SPHERICAL and RADIAL enum
@@ -127,7 +114,6 @@
   (if (= (logand options (cam-index-options RADIAL)) (cam-index-options RADIAL)) (format output "SPHERICAL "))
   (the-as string output))
 
-;; definition for function slave-los-state->string
 (defun slave-los-state->string ((los-state slave-los-state))
   "Return the debug name of a camera line-of-sight state, or *unknown* for an
    unrecognized value."
@@ -138,8 +124,6 @@
     (((slave-los-state none)) "none")
     (else "*unknown*")))
 
-;; definition for function cam-line-dma
-;; Used lq/sq
 (defun cam-line-dma ()
   "Append the current transformed debug-line endpoints and color to the
    no-depth-test debug DMA bucket."
@@ -199,7 +183,6 @@
                              packet-start
                              (the-as (pointer dma-tag) next-tag)))))
 
-;; definition for function camera-line2d
 (defun camera-line2d ((start vector4w) (end vector4w))
   "Draw a line between two screen-space points. Convert pixels to GS 12.4
    coordinates, invert Y, and place both endpoints at the far 24-bit depth."
@@ -211,9 +194,6 @@
   (set! (-> (scratchpad-object cam-dbg-scratch) linevec4w 1 z) #x7fffff)
   (cam-line-dma))
 
-;; definition for function camera-plot-float-func
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defun camera-plot-float-func ((x-min float) (x-max float) (y-min float) (y-max float) (fn (function float float)) (color vector4w))
   "Plot fn over [x-min, x-max] in a 400 by 200 pixel debug graph. Map
    [y-min, y-max] to the plot height, draw the axes and border at screen offset
@@ -275,9 +255,6 @@
   0
   (none))
 
-;; definition for function camera-line-setup
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defun camera-line-setup ((color vector4w))
   "Select the color for subsequent camera-line-draw calls and initialize the
    identity world-to-screen transform."
@@ -286,9 +263,6 @@
   0
   (none))
 
-;; definition for function camera-line-draw
-;; INFO: Return type mismatch int vs symbol.
-;; Used lq/sq
 (defun camera-line-draw ((start vector) (end vector))
   "Transform and draw one world-space line using the color selected by
    camera-line-setup. Reject either endpoint whose transformed depth is past
@@ -308,8 +282,6 @@
   (cam-line-dma)
   (the-as symbol 0))
 
-;; definition for function camera-line
-;; INFO: Return type mismatch int vs none.
 (defun camera-line ((start vector) (end vector) (color vector4w))
   "Draw one world-space line in color."
   (camera-line-setup color)
@@ -317,14 +289,12 @@
   0
   (none))
 
-;; definition for function camera-line-rel
 (defun camera-line-rel ((start vector) (offset vector) (color vector4w))
   "Draw a line from start to start plus offset."
   (vector+! (the-as vector (+ 112 (scratchpad-object int))) start offset)
   (camera-line start (the-as vector (+ 112 (scratchpad-object int))) color)
   (none))
 
-;; definition for function camera-line-rel-len
 (defun camera-line-rel-len ((start vector) (direction vector) (length float) (color vector4w))
   "Normalize direction to length and draw that displacement from start."
   (vector-normalize-copy! (the-as vector (+ 112 (scratchpad-object int))) direction length)
@@ -332,8 +302,6 @@
   (camera-line start (the-as vector (+ 112 (scratchpad-object int))) color)
   (none))
 
-;; definition for function camera-sphere
-;; INFO: Return type mismatch int vs none.
 (defun camera-sphere ((center vector) (radius float) (color vector))
   "Draw a sphere as a ten-by-ten latitude/longitude wireframe."
   (camera-line-setup (the-as vector4w color))
@@ -363,8 +331,6 @@
   0
   (none))
 
-;; definition for function camera-cross
-;; INFO: Return type mismatch none vs basic.
 (defun camera-cross ((axis-a vector) (axis-b vector) (center vector) (color vector4w) (half-length meters))
   "Draw three perpendicular diameter lines through center. The first axis is
    axis-a; the other two are formed by successive crosses with axis-b and
@@ -385,9 +351,6 @@
   (the-as basic
           (camera-line (the-as vector (+ 208 (scratchpad-object int))) (the-as vector (+ 224 (scratchpad-object int))) color)))
 
-;; definition for function camera-bounding-box-draw
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defun camera-bounding-box-draw ((bounds bounding-box) (unused-options basic) (unused-color rgba))
   "Draw the twelve edges of bounds in the original fixed gray. The two
    trailing arguments are retained for compatibility but are not read."
@@ -419,7 +382,6 @@
   0
   (none))
 
-;; definition of type cam-debug-tri
 (deftype cam-debug-tri (structure)
   ((vertex    vector 3 :inline :offset-assert 0)
    (intersect vector :inline :offset-assert 48)
@@ -428,7 +390,6 @@
   :size-assert #x44
   :flag-assert #x900000044)
 
-;; definition for method 3 of type cam-debug-tri
 (defmethod inspect ((obj cam-debug-tri))
   (format #t "[~8x] ~A~%" obj 'cam-debug-tri)
   (format #t "~Tvertex[3] @ #x~X~%" (-> obj vertex))
@@ -436,20 +397,14 @@
   (format #t "~Tcolor: #<vector4w @ #x~X>~%" (-> obj color))
   obj)
 
-;; definition for symbol *cam-debug-los-tri-current*, type int
 (define *cam-debug-los-tri-current* 0)
 
-;; definition for symbol *cam-debug-los-tri*, type (inline-array cam-debug-tri)
 (define *cam-debug-los-tri* (the-as (inline-array cam-debug-tri) (malloc 'debug #x8fc0)))
 
-;; definition for symbol *cam-debug-coll-tri-current*, type int
 (define *cam-debug-coll-tri-current* 0)
 
-;; definition for symbol *cam-debug-coll-tri*, type (inline-array cam-debug-tri)
 (define *cam-debug-coll-tri* (the-as (inline-array cam-debug-tri) (malloc 'debug #x8fc0)))
 
-;; definition for function cam-debug-reset-coll-tri
-;; INFO: Return type mismatch int vs none.
 (defun cam-debug-reset-coll-tri ()
   "Clear the per-frame camera collision and line-of-sight triangle lists."
   (set! *cam-debug-los-tri-current* 0)
@@ -457,9 +412,6 @@
   0
   (none))
 
-;; definition for function cam-debug-add-los-tri
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defun cam-debug-add-los-tri ((triangles (inline-array collide-cache-tri)) (intersection vector) (color vector))
   "Save the first collision-cache triangle, intersection, and color in the
    line-of-sight debug list. The list holds at most 460 entries."
@@ -477,9 +429,6 @@
   0
   (none))
 
-;; definition for function cam-debug-add-coll-tri
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defun cam-debug-add-coll-tri ((triangle cam-debug-tri) (intersection vector) (color-data cam-debug-tri))
   "Copy a camera debug triangle with a new intersection and color into the
    collision debug list. The list holds at most 460 entries."
@@ -497,8 +446,6 @@
   0
   (none))
 
-;; definition for function cam-debug-draw-tris
-;; Used lq/sq
 (defun cam-debug-draw-tris ()
   "Draw the recorded camera line-of-sight and collision triangles selected by
    the corresponding display flags, with a cross at each intersection."
@@ -535,7 +482,6 @@
                     (meters 0.25)))
     #f))
 
-;; definition for function camera-fov-draw
 (defun camera-fov-draw ((direction-a-address int)
         (direction-b-address int)
         (origin vector)
@@ -559,9 +505,6 @@
   (camera-line-draw (the-as vector (+ 352 (scratchpad-object int))) (the-as vector (+ 368 (scratchpad-object int))))
   (camera-line-draw (the-as vector (+ 368 (scratchpad-object int))) (the-as vector (+ 384 (scratchpad-object int)))))
 
-;; definition for function camera-fov-frame
-;; INFO: Return type mismatch symbol vs none.
-;; Used lq/sq
 (defun camera-fov-frame ((inverse-rotation matrix)
         (origin vector)
         (half-fov float)
@@ -619,8 +562,6 @@
   (camera-fov-draw (+ 400 (scratchpad-object int)) (+ 416 (scratchpad-object int)) origin 4096.0 20480.0 color)
   (none))
 
-;; definition for method 11 of type tracking-spline
-;; INFO: Return type mismatch int vs none.
 (defmethod print-nth-point ((this tracking-spline) (point-index int))
   "Print one breadcrumb with markers for the used head, next-to-last point,
    and end point."
diff --git a/goal_src/jak1/engine/camera/cam-interface.gc b/goal_src/jak1/engine/camera/cam-interface.gc
index 1b48c1e232..6da31fa517 100644
--- a/goal_src/jak1/engine/camera/cam-interface.gc
+++ b/goal_src/jak1/engine/camera/cam-interface.gc
@@ -8,7 +8,6 @@
 (require "engine/entity/entity-h.gc")
 (require "engine/math/transformq-h.gc")
 
-;; definition for function position-in-front-of-camera!
 (defun position-in-front-of-camera! ((out vector) (forward-distance float) (up-distance float))
   "Place out at forward-distance along the camera's
    forward axis and up-distance along its up axis, measured from the current camera translation."
@@ -17,22 +16,18 @@
   (vector+! out out (-> *math-camera* trans))
   out)
 
-;; definition for function matrix-local->world
 (defun matrix-local->world ((smooth? symbol) (unused-mode symbol))
   "Return the camera local-to-world rotation. smooth? selects the
    smoothed inverse-camera matrix; the second argument is retained for the shared interface but is
    unused."
   (if smooth? (-> *math-camera* inv-camera-rot-smooth) (-> *math-camera* inv-camera-rot)))
 
-;; definition for function matrix-world->local
 (defun matrix-world->local ()
   "Return the current world-to-camera rotation matrix."
   (-> *math-camera* camera-rot))
 
 (define-perm *camera-dummy-vector* vector (vector-reset! (new 'global 'vector)))
 
-;; definition for function camera-pos
-;; INFO: Return type mismatch object vs vector.
 (defun camera-pos ()
   "Return the active camera position. Prefer the combiner output while a
    camera transition is active, otherwise use the renderer camera, with a zero-vector fallback
@@ -43,12 +38,10 @@
             (*math-camera* (-> *math-camera* trans))
             (else *camera-dummy-vector*))))
 
-;; definition for function math-camera-pos
 (defun math-camera-pos ()
   "Return the renderer's current camera translation."
   (-> *math-camera* trans))
 
-;; definition for function camera-angle
 (defun camera-angle ()
   "Return the camera's horizontal heading from the X and Z components of
    the world-to-camera right axis."
@@ -56,9 +49,6 @@
         (right-z (-> *math-camera* camera-rot vector 0 z)))
     (atan right-z right-x)))
 
-;; definition for function camera-teleport-to-entity
-;; INFO: Return type mismatch int vs none.
-;; Used lq/sq
 (defbehavior camera-teleport-to-entity process ((start-entity entity-actor))
   "Build a unit-scale camera transform from start-entity's
    orientation and the position stored in the scale vector of its extra transform, then send it to
diff --git a/goal_src/jak1/engine/collide/collide-cache.gc b/goal_src/jak1/engine/collide/collide-cache.gc
index 53c36aa7f7..355927ca5b 100644
--- a/goal_src/jak1/engine/collide/collide-cache.gc
+++ b/goal_src/jak1/engine/collide/collide-cache.gc
@@ -3130,8 +3130,6 @@ integer bounds overlap collide-work.collide-box4w."
     (.ppach v1-3 zero v1-2)
     (let ((v1-4 (shl (the-as int v1-3) 16))) (nop!) (zero? v1-4))))
 
-;; definition for method 12 of type collide-fragment
-;; INFO: Return type mismatch int vs none.
 (defmethod collide-y-probe ((obj collide-fragment) (count int) (clist collide-list))
   "Append each fragment in this contiguous range whose bounding sphere intersects the active
    vertical probe."
@@ -3144,8 +3142,6 @@ integer bounds overlap collide-work.collide-box4w."
   0
   (none))
 
-;; definition for method 12 of type instance-tie
-;; INFO: Return type mismatch int vs none.
 (defmethod collide-y-probe ((obj instance-tie) (count int) (clist collide-list))
   "Append every collision fragment of each enabled TIE instance in this contiguous range whose
    transformed bounds intersect the active vertical probe."
diff --git a/goal_src/jak1/engine/game/effect-control.gc b/goal_src/jak1/engine/game/effect-control.gc
index 3e0c5c72ad..b840940a2c 100644
--- a/goal_src/jak1/engine/game/effect-control.gc
+++ b/goal_src/jak1/engine/game/effect-control.gc
@@ -7,13 +7,10 @@
 
 ;; DECOMP BEGINS
 
-;; definition for symbol *footstep-surface*, type int
 (define *footstep-surface* 448)
 
-;; definition for symbol *debug-effect-control*, type symbol
 (define *debug-effect-control* #f)
 
-;; definition for function sound-name-with-material
 (defun sound-name-with-material ((base-name symbol) (ground-surface pat-surface) (suffix string))
   "Build a sound name from base, the collision material's sound-family name, and suffix. Materials
    that share audio use the pcmetal, metal, or grass family, and waterbottom and deepsnow use the
@@ -46,7 +43,6 @@
                suffix))
   (string->sound-name *temp-string*))
 
-;; definition for function effect-param->sound-spec
 (defun effect-param->sound-spec ((specification sound-spec) (parameters (pointer float)) (value-count int))
   "Apply opcode/value pairs to spec. Opcodes set or randomly add volume, pitch, and bend; set falloff
    minimum, maximum, and curve; or set priority. value-count counts floats and is consumed two at a
@@ -85,9 +81,6 @@
     (set! parameters (&-> parameters 2)))
   specification)
 
-;; definition for method 9 of type effect-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 ;; Effect tags are authored in the animation's artist-frame domain rather than its internal frame
 ;; indices. The selected channel supplies the conversion, while root channel zero supplies the
 ;; frame-advance function that determines whether the interval moved, sought, wrapped, or held.
@@ -148,9 +141,6 @@
   0
   (none))
 
-;; definition for method 14 of type effect-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod play-effects-from-res-lump ((this effect-control) (lower-frame float) (upper-frame float) (exact-frame float))
   "Dispatch each consecutive effect-name tag strictly between the
    lower and upper frame bounds, plus a tag exactly equal to exact-frame."
@@ -174,9 +164,6 @@
   0
   (none))
 
-;; definition for method 10 of type effect-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs object.
 ;; An effect-name symbol doubles as the dispatch key and, when bound, the effect object. The
 ;; effect- and group- prefixes provide two data-driven families; the remaining cases accept direct
 ;; particle launchers, particle groups, sound specifications, death effects, and ordinary sounds.
@@ -332,9 +319,6 @@
                             (string->sound-name (symbol->string effect-name)))))))
   0)
 
-;; definition for method 11 of type effect-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 ;; Surface effects share authored event names but select their particle and sound assets from the
 ;; collision material. Materials without a specialized asset use the grass family.
 (defmethod do-effect-for-surface ((this effect-control) (effect-name symbol) (frame float) (joint-index int) (resource-lump basic) (ground-surface pat-surface))
@@ -537,8 +521,6 @@
   0
   (none))
 
-;; definition for method 12 of type effect-control
-;; INFO: Used lq/sq
 ;; Each sound starts at full volume with a small random bend. An exact-frame effect-param array may
 ;; replace or perturb that base specification before the falloff test and playback.
 (defmethod play-effect-sound ((this effect-control) (effect-name symbol) (frame float) (joint-index int) (resource-lump basic) (effect-sound sound-name))
@@ -590,8 +572,6 @@
     (sound-play-by-spec specification (new-sound-id) joint-position))
   0)
 
-;; definition for function target-land-effect
-;; INFO: Return type mismatch int vs none.
 (defbehavior target-land-effect target ()
   "Play landing effects for the target's current movement and surface. Flut launches its landing
    poof and sound, racer plays an impact-scaled zoom sound, water uses the water landing effect, and
diff --git a/goal_src/jak1/engine/gfx/background/wind.gc b/goal_src/jak1/engine/gfx/background/wind.gc
index ce00aee3b0..c91dbfd3cc 100644
--- a/goal_src/jak1/engine/gfx/background/wind.gc
+++ b/goal_src/jak1/engine/gfx/background/wind.gc
@@ -6,11 +6,8 @@
 
 ;; note: modified for high fps
 
-;; definition for symbol *wind-work*, type wind-work
 (define *wind-work* (new 'global 'wind-work))
 
-;; definition for function update-wind
-;; INFO: Return type mismatch int vs none.
 (defun update-wind ((work wind-work) (gust-table (array uint8)))
   "Advance the shared procedural wind. Random-walk the ground-plane heading, then linearly
    interpolate the cyclic gust table over 120 effective ticks per entry and multiply that envelope
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
index 9314d40613..67e83dec71 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
@@ -1032,8 +1032,6 @@
     (.ppach packed (the-as uint128 0) negative-lanes)
     (zero? (the-as int packed))))
 
-;; definition for function draw-ocean-mid-seams
-;; INFO: Return type mismatch symbol vs none.
 (defun draw-ocean-mid-seams ((dma-buf dma-buffer))
   "Stitch the border of the region marked in mid-camera-masks so the 96-meter mid cells meet the finer
    transition and near geometry without cracks, then fold the camera masks into the block packets that
diff --git a/goal_src/jak1/engine/gfx/ocean/ocean.gc b/goal_src/jak1/engine/gfx/ocean/ocean.gc
index 6408114595..c2573666c1 100644
--- a/goal_src/jak1/engine/gfx/ocean/ocean.gc
+++ b/goal_src/jak1/engine/gfx/ocean/ocean.gc
@@ -375,7 +375,6 @@
       (render-ocean-quad vertices dma-buf)))
   (none))
 
-;; definition for symbol *swamp-low-ocean-marker*, type vector
 (define *swamp-low-ocean-marker* (new 'global 'vector))
 
 ;; The swamp's water sits just under its walkways rather than at the level's nominal sea level.
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
index 8e9286d2b1..48c1a6981b 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-methods.gc
@@ -17,8 +17,6 @@
 
 ;; DECOMP BEGINS
 
-;; definition for function edge-debug-lines
-;; INFO: Return type mismatch symbol vs none.
 (defun edge-debug-lines ((edge-lists (array vector-array)))
   "Draw the selected edge lists as pairs of white, translucent, depth-independent debug lines.
    *display-strip-lines* selects lists by bit position."
@@ -48,8 +46,6 @@
 ;; has finished.
 
 (#unless PC_PORT
-  ;; definition for function draw-drawable-tree-tfrag
-  ;; INFO: Return type mismatch drawable-tree-tfrag vs none.
   (defun draw-drawable-tree-tfrag ((tree drawable-tree-tfrag))
     "Cull the tree hierarchy, build the opaque far and near terrain DMA streams, submit them to the
      current level's terrain buckets, and account for the DMA storage used."
@@ -251,8 +247,6 @@
     (none)))
 
 (#unless PC_PORT
-  ;; definition for function draw-drawable-tree-trans-tfrag
-  ;; INFO: Return type mismatch drawable-tree-trans-tfrag vs none.
   (defun draw-drawable-tree-trans-tfrag ((tree drawable-tree-trans-tfrag))
     "Cull the tree hierarchy and build alpha-blended far and near terrain streams using the
      translucent TEST state and buckets."
@@ -478,8 +472,6 @@
     (none)))
 
 (#unless PC_PORT
-  ;; definition for function draw-drawable-tree-dirt-tfrag
-  ;; INFO: Return type mismatch drawable-tree-dirt-tfrag vs none.
   (defun draw-drawable-tree-dirt-tfrag ((tree drawable-tree-dirt-tfrag))
     "Cull the tree hierarchy and build alpha-blended far and near dirt-terrain streams using their
      dedicated TEST state and buckets."
@@ -690,8 +682,6 @@
     (none)))
 
 (#unless PC_PORT
-  ;; definition for function draw-drawable-tree-ice-tfrag
-  ;; INFO: Return type mismatch drawable-tree-ice-tfrag vs none.
   (defun draw-drawable-tree-ice-tfrag ((tree drawable-tree-ice-tfrag))
     "Cull the tree hierarchy and build alpha-blended far and near ice-terrain streams using their
      dedicated TEST state and buckets."
@@ -893,8 +883,6 @@
           )))
     (none)))
 
-;; definition for method 10 of type drawable-tree-tfrag
-;; INFO: Return type mismatch drawable-tree-tfrag vs none.
 (defmethod draw ((this drawable-tree-tfrag) (submitted-tree drawable-tree-tfrag) (frame display-frame))
   "Queue this terrain tree and its owning level for the background renderer."
   (let* ((queue-index (-> *background-work* tfrag-tree-count))
@@ -905,8 +893,6 @@
   (+! (-> *background-work* tfrag-tree-count) 1)
   (none))
 
-;; definition for method 10 of type drawable-tree-trans-tfrag
-;; INFO: Return type mismatch drawable-tree-trans-tfrag vs none.
 (defmethod draw ((this drawable-tree-trans-tfrag) (submitted-tree drawable-tree-trans-tfrag) (frame display-frame))
   "Queue this translucent terrain tree and its owning level for the background renderer."
   (let* ((queue-index (-> *background-work* trans-tfrag-tree-count))
@@ -917,8 +903,6 @@
   (+! (-> *background-work* trans-tfrag-tree-count) 1)
   (none))
 
-;; definition for method 10 of type drawable-tree-dirt-tfrag
-;; INFO: Return type mismatch drawable-tree-dirt-tfrag vs none.
 (defmethod draw ((this drawable-tree-dirt-tfrag) (submitted-tree drawable-tree-dirt-tfrag) (frame display-frame))
   "Queue this dirt terrain tree and its owning level for the background renderer."
   (let* ((queue-index (-> *background-work* dirt-tfrag-tree-count))
@@ -929,8 +913,6 @@
   (+! (-> *background-work* dirt-tfrag-tree-count) 1)
   (none))
 
-;; definition for method 10 of type drawable-tree-ice-tfrag
-;; INFO: Return type mismatch drawable-tree-ice-tfrag vs none.
 (defmethod draw ((this drawable-tree-ice-tfrag) (submitted-tree drawable-tree-ice-tfrag) (frame display-frame))
   "Queue this ice terrain tree and its owning level for the background renderer."
   (let* ((queue-index (-> *background-work* ice-tfrag-tree-count))
@@ -941,8 +923,6 @@
   (+! (-> *background-work* ice-tfrag-tree-count) 1)
   (none))
 
-;; definition for method 10 of type drawable-tree-lowres-tfrag
-;; INFO: Return type mismatch drawable-tree-lowres-tfrag vs none.
 (defmethod draw ((this drawable-tree-lowres-tfrag) (submitted-tree drawable-tree-lowres-tfrag) (frame display-frame))
   "Queue this low-resolution terrain tree and its owning level for the background renderer."
   (let* ((queue-index (-> *background-work* lowres-tfrag-tree-count))
@@ -953,8 +933,6 @@
   (+! (-> *background-work* lowres-tfrag-tree-count) 1)
   (none))
 
-;; definition for method 10 of type drawable-tree-lowres-trans-tfrag
-;; INFO: Return type mismatch drawable-tree-lowres-trans-tfrag vs none.
 (defmethod draw ((this drawable-tree-lowres-trans-tfrag) (submitted-tree drawable-tree-lowres-trans-tfrag) (frame display-frame))
   "Queue this low-resolution translucent terrain tree and its owning level for the background
    renderer."
@@ -966,16 +944,12 @@
   (+! (-> *background-work* lowres-trans-tfrag-tree-count) 1)
   (none))
 
-;; definition for method 14 of type tfragment
 (defmethod collect-stats ((this tfragment))
   "Classify this fragment against the camera and add the selected detail stream's counts to the
    active terrain statistics."
   (stats-tfrag-asm this)
   (none))
 
-;; definition for method 14 of type drawable-tree-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-tfrag))
   "Configure normal-terrain statistics and traverse every array in this tree."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask tfrag))
@@ -988,9 +962,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-tree-lowres-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-lowres-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-lowres-tfrag))
   "Configure normal-terrain statistics and traverse every low-resolution array in this tree."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask tfrag))
@@ -1003,9 +974,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-tree-trans-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-trans-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-trans-tfrag))
   "Configure translucent-terrain statistics and traverse every array in this tree."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
@@ -1018,9 +986,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-tree-lowres-trans-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-lowres-trans-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-lowres-trans-tfrag))
   "Configure translucent-terrain statistics and traverse every low-resolution array in this
    tree."
@@ -1034,9 +999,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-tree-dirt-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-dirt-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-dirt-tfrag))
   "Configure translucent-terrain statistics and traverse every dirt array in this tree."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
@@ -1049,9 +1011,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-tree-ice-tfrag
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch drawable-tree-ice-tfrag vs none.
 (defmethod collect-stats ((this drawable-tree-ice-tfrag))
   "Configure translucent-terrain statistics and traverse every ice array in this tree."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
@@ -1064,8 +1023,6 @@
       (collect-stats (-> this arrays i))))
   (none))
 
-;; definition for method 14 of type drawable-inline-array-tfrag
-;; INFO: Return type mismatch drawable-inline-array-tfrag vs none.
 (defmethod collect-stats ((this drawable-inline-array-tfrag))
   "Accumulate statistics for the visible fragments in this inline array."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask tfrag))
@@ -1073,8 +1030,6 @@
       (let ((fragment (-> this data i))) (if (vis-cull (-> fragment id)) (collect-stats fragment)))))
   (none))
 
-;; definition for method 14 of type drawable-inline-array-trans-tfrag
-;; INFO: Return type mismatch drawable-inline-array-trans-tfrag vs none.
 (defmethod collect-stats ((this drawable-inline-array-trans-tfrag))
   "Accumulate statistics for the visible translucent fragments in this inline array."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask trans-tfrag))
@@ -1082,8 +1037,6 @@
       (let ((fragment (-> this data i))) (if (vis-cull (-> fragment id)) (collect-stats fragment)))))
   (none))
 
-;; definition for method 15 of type drawable-tree-tfrag
-;; INFO: Return type mismatch drawable-tree-tfrag vs none.
 (defmethod debug-draw ((this drawable-tree-tfrag) (submitted-tree drawable) (frame display-frame))
   "Draw debug geometry for every array in this tree while terrain rendering is enabled."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask tfrag))
@@ -1091,8 +1044,6 @@
       (let ((child (-> this arrays i))) (debug-draw child child frame))))
   (none))
 
-;; definition for method 15 of type drawable-tree-trans-tfrag
-;; INFO: Return type mismatch drawable-tree-trans-tfrag vs none.
 (defmethod debug-draw ((this drawable-tree-trans-tfrag) (submitted-tree drawable) (frame display-frame))
   "Draw debug geometry for every array in this tree while terrain rendering is enabled."
   (when (logtest? *vu1-enable-user* (vu1-renderer-mask tfrag))
@@ -1100,15 +1051,12 @@
       (let ((child (-> this arrays i))) (debug-draw child child frame))))
   (none))
 
-;; definition for method 15 of type drawable-inline-array-tfrag
-;; INFO: Return type mismatch drawable-inline-array-tfrag vs none.
 (defmethod debug-draw ((this drawable-inline-array-tfrag) (submitted-array drawable) (frame display-frame))
   "Draw debug geometry for every visible fragment in this inline array."
   (dotimes (i (-> this length))
     (let ((fragment (-> this data i))) (if (vis-cull (-> fragment id)) (debug-draw fragment fragment frame))))
   (none))
 
-;; definition for method 15 of type tfragment
 (defmethod debug-draw ((this tfragment) (submitted-fragment drawable) (frame display-frame))
   "Draw this fragment's saved edge-debug geometry."
   (-> frame global-buf)
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
index d86a97c02e..c776ab80fb 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-near.gc
@@ -1121,9 +1121,6 @@
     (disasm-vif-tag (the-as (pointer vif-tag) level-1-data) (the-as int (* level-1-qwc 4)) (the-as symbol 0) #t))
   (none))
 
-;; definition (debug) for function clip-restore
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch vector vs none.
 (defun-debug clip-restore ()
   "Move the debug camera to a captured Sandover pose used to inspect near-terrain clipping."
   (let ((camera-position (new-stack-vector0))
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
index c2e3b30c8c..2a617b84a2 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag-work.gc
@@ -6,7 +6,6 @@
 (require "engine/gfx/tfrag/tfrag-h.gc")
 (require "kernel/gkernel.gc")
 
-;; definition for symbol *tfrag-work*, type tfrag-work
 ;; These packet templates are copied while assembling each visible fragment. The four REF templates
 ;; select the base/common/detail streams; the CNT template expands packed per-frame colors into VU
 ;; input. max-dist.z is the initial "no visible fragment" distance used by finish-background.
diff --git a/goal_src/jak1/engine/gfx/tfrag/tfrag.gc b/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
index b3e6321d21..d208b8d681 100644
--- a/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
+++ b/goal_src/jak1/engine/gfx/tfrag/tfrag.gc
@@ -113,7 +113,6 @@
     (adgif-shader-login-no-remap (-> this shader i)))
   this)
 
-;; definition for method 8 of type tfragment
 (defmethod mem-usage ((this tfragment) (usage memory-usage-block) (flags int))
   "Account for the fragment header, overlapping base/common/LOD DMA streams, colors, and debug
    data. With the color-only flag, record only the packed per-LOD colors; the separate-prototype-data
@@ -188,14 +187,12 @@
     (format #t "~T  [~D] ~A~%" i (-> this data i)))
   this)
 
-;; definition for method 9 of type drawable-inline-array-tfrag
 (defmethod login ((this drawable-inline-array-tfrag))
   "Log in every inline terrain fragment."
   (dotimes (i (-> this length))
     (login (-> this data i)))
   this)
 
-;; definition for method 8 of type drawable-inline-array-tfrag
 (defmethod mem-usage ((this drawable-inline-array-tfrag) (usage memory-usage-block) (flags int))
   "Account for the inline-array header and delegate to every terrain fragment."
   (set! (-> usage length) (max 1 (-> usage length)))
@@ -208,7 +205,6 @@
     (mem-usage (-> this data i) usage flags))
   this)
 
-;; definition for method 8 of type drawable-tree-tfrag
 (defmethod mem-usage ((this drawable-tree-tfrag) (usage memory-usage-block) (flags int))
   "Account for the tree header, optional time-of-day palette, and every inline fragment array."
   (set! (-> usage length) (max 1 (-> usage length)))
@@ -228,8 +224,6 @@
     (mem-usage (-> this arrays i) usage flags))
   this)
 
-;; definition for method 5 of type drawable-inline-array-tfrag
-;; INFO: Return type mismatch uint vs int.
 (defmethod asize-of ((this drawable-inline-array-tfrag))
   "Return the nominal inline-array size, which includes its first terrain fragment, plus 64
    bytes for each additional active fragment."
@@ -2981,9 +2975,6 @@
                 (vu-pair (iaddiu subroutine-link vi00 0x734) (nop))))) ;; #x74a
           ))
 
-;; definition for function tfrag-data-setup
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch tfrag-data vs none.
 (defun tfrag-data-setup ((data tfrag-data) (alpha-blend int))
   "Fill the shared VU1 fog, GIF, homogeneous-screen, ambient, guard-volume, and distance constants.
    alpha-blend selects the GS ABE bit; *subdivide-draw-mode* can replace textured strips and fans with
@@ -3051,8 +3042,6 @@
   (set-tfrag-dists! (-> data dists))
   (none))
 
-;; definition for function add-tfrag-mtx-0
-;; INFO: Return type mismatch pointer vs none.
 (defun add-tfrag-mtx-0 ((dma-buf dma-buffer))
   "Append the camera transform for VU1 input bank zero at quadword 5."
   (let* ((qwc-count 4)
@@ -3068,8 +3057,6 @@
   (&+! (-> dma-buf base) 64)
   (none))
 
-;; definition for function add-tfrag-mtx-1
-;; INFO: Return type mismatch pointer vs none.
 (defun add-tfrag-mtx-1 ((dma-buf dma-buffer))
   "Append the camera transform for VU1 input bank one at quadword 333."
   (let* ((qwc-count 4)
@@ -3085,8 +3072,6 @@
   (&+! (-> dma-buf base) 64)
   (none))
 
-;; definition for function add-tfrag-data
-;; INFO: Return type mismatch pointer vs none.
 (defun add-tfrag-data ((dma-buf dma-buffer) (alpha-blend int))
   "Append the fourteen shared terrain-renderer quadwords at VU address 656, then call VU1 entry
    zero to initialize its alternating output buffers."
@@ -3154,8 +3139,6 @@
 
 (define t-stat (new 'global 'tfrag-stats))
 
-;; definition for function tfrag-print-stats
-;; INFO: Return type mismatch symbol vs none.
 (defun tfrag-print-stats ((destination symbol))
   "Print the terrain renderer's triangle, vertex, strip, shader, and DMA statistics to destination
    when terrain statistics are enabled outside the menu."
@@ -3191,7 +3174,6 @@
 ;; buffer
 ;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; INFO: Return type mismatch symbol vs none.
 (#unless PC_PORT
   (defun tfrag-init-buffer ((dma-buf dma-buffer) (test gs-test) (alpha-blend int))
     "Upload the terrain VU1 program, install TEST_1, both camera-matrix banks, and shared constants,
@@ -3284,8 +3266,6 @@
     (set! (-> t-stat level1-verts) 0)
     (none)))
 
-;; definition for function tfrag-end-buffer
-;; INFO: Return type mismatch symbol vs none.
 (defun tfrag-end-buffer ((dma-buf dma-buffer))
   "Patch the final terrain VU call into the DMA stream, wait for VU1, and restore the VIF mode, row,
    base, offset, and cycle state expected by the next renderer."
@@ -3837,8 +3817,6 @@
     (nop!)
     (nop!))))
 
-;; definition for function tfrag-near-init-buffer
-;; INFO: Return type mismatch symbol vs none.
 (defun tfrag-near-init-buffer ((dma-buf dma-buffer) (test gs-test) (alpha-blend int))
   "Initialize the near-terrain DMA stream with its VU1 program, TEST_1 state, both camera-matrix
    banks, shared constants, and VIF double-buffer base and offset."
@@ -3870,8 +3848,6 @@
   (set! (-> *tfrag-work* last-call) (the-as uint 0))
   (none))
 
-;; definition for function tfrag-near-end-buffer
-;; INFO: Return type mismatch symbol vs none.
 (defun tfrag-near-end-buffer ((dma-buf dma-buffer))
   "Patch the final near-terrain VU call into the DMA stream, wait for VU1, and restore the VIF mode,
    row, base, offset, and cycle state."
diff --git a/goal_src/jak1/engine/gfx/tie/tie.gc b/goal_src/jak1/engine/gfx/tie/tie.gc
index 099f549006..da5cb2d96b 100644
--- a/goal_src/jak1/engine/gfx/tie/tie.gc
+++ b/goal_src/jak1/engine/gfx/tie/tie.gc
@@ -117,7 +117,6 @@
 ;;;;;;;;;;;;;;;;;
 ;; Basic Methods
 ;;;;;;;;;;;;;;;;;
-;; definition for method 9 of type tie-fragment
 (defmethod login ((this tie-fragment))
   "Log in each five-quadword adgif shader referenced by this fragment."
   (let ((shaders (-> this gif-ref))
@@ -126,7 +125,6 @@
       (adgif-shader-login-no-remap (-> shaders i))))
   this)
 
-;; definition for method 3 of type drawable-inline-array-instance-tie
 (defmethod inspect ((this drawable-inline-array-instance-tie))
   (format #t "[~8x] ~A~%" this (-> this type))
   (format #t "~Tlength: ~D~%" (-> this length))
@@ -135,29 +133,23 @@
     (format #t "~T  [~D] ~A~%" i (-> this data i)))
   this)
 
-;; definition for method 5 of type drawable-inline-array-instance-tie
-;; INFO: Return type mismatch uint vs int.
 (defmethod asize-of ((this drawable-inline-array-instance-tie))
   "Return the array header size plus storage for its active inline TIE instances."
   (the-as int (+ (-> drawable-inline-array-instance-tie size) (* (+ (-> this length) -1) 64))))
 
-;; definition for method 9 of type drawable-tree-instance-tie
 ;; INFO: this function exists in multiple non-identical object files
 (#unless PC_PORT
   (defmethod login ((this drawable-tree-instance-tie))
     "Leave this TIE instance tree unchanged."
     this))
 
-;; definition for method 9 of type drawable-tree-instance-tie
 ;; INFO: this function exists in multiple non-identical object files
-;; INFO: Return type mismatch symbol vs drawable-tree-instance-tie.
 (defmethod login ((this drawable-tree-instance-tie))
   "Log in every child drawable in this TIE instance tree."
   (dotimes (i (-> this length))
     (login (-> this data i)))
   (the-as drawable-tree-instance-tie #f))
 
-;; definition for method 3 of type prototype-tie
 (defmethod inspect ((this prototype-tie))
   (format #t "[~8x] ~A~%" this (-> this type))
   (format #t "~Tlength: ~D~%" (-> this length))
@@ -166,14 +158,12 @@
     (format #t "~T  [~D] ~A~%" i (-> this data i)))
   this)
 
-;; definition for method 9 of type prototype-tie
 (defmethod login ((this prototype-tie))
   "Log in every inline TIE fragment."
   (dotimes (i (-> this length))
     (login (-> this data i)))
   this)
 
-;; definition for method 8 of type drawable-tree-instance-tie
 (defmethod mem-usage ((this drawable-tree-instance-tie) (usage memory-usage-block) (flags int))
   "Account for the tree header, its child drawables, and its prototype array. The prototype
    pass is marked so fragments are not charged as independent allocations a second time."
@@ -190,7 +180,6 @@
   (mem-usage (-> this prototypes prototype-array-tie) usage (logior flags 1))
   this)
 
-;; definition for method 8 of type tie-fragment
 (defmethod mem-usage ((this tie-fragment) (usage memory-usage-block) (flags int))
   "Account for this prototype's header and referenced shader, point, draw-point, generic, and
    debug data. With the instance-color flag, account only for one instance's packed color table in
@@ -246,7 +235,6 @@
   (label cfg-13)
   this)
 
-;; definition for method 8 of type instance-tie
 (defmethod mem-usage ((this instance-tie) (usage memory-usage-block) (flags int))
   "Account for this instance and, when it owns color overrides, ask each available geometry
    prototype to account for the corresponding packed instance-color table."
@@ -284,7 +272,6 @@
                             flags))))))))
   this)
 
-;; definition for method 8 of type drawable-inline-array-instance-tie
 (defmethod mem-usage ((this drawable-inline-array-instance-tie) (usage memory-usage-block) (flags int))
   "Account for the inline-array header and every active TIE instance."
   (set! (-> usage length) (max 1 (-> usage length)))
@@ -297,7 +284,6 @@
     (mem-usage (-> this data i) usage flags))
   this)
 
-;; definition for method 8 of type prototype-tie
 (defmethod mem-usage ((this prototype-tie) (usage memory-usage-block) (flags int))
   "Account for the prototype-array header and every inline TIE fragment."
   (set! (-> usage length) (max 1 (-> usage length)))
@@ -310,8 +296,6 @@
     (mem-usage (-> this data i) usage flags))
   this)
 
-;; definition for method 5 of type prototype-tie
-;; INFO: Return type mismatch uint vs int.
 (defmethod asize-of ((this prototype-tie))
   "Return the prototype-array header size plus storage for its active inline fragments."
   (the-as int (+ (-> prototype-tie size) (* (+ (-> this length) -1) 64))))
@@ -1668,8 +1652,6 @@
             (vu-pair (nop) (nop)) ;; #x3e0
             )))
 
-;; definition for function tie-init-consts
-;; INFO: Return type mismatch int vs none.
 (defun tie-init-consts ((consts tie-consts) (alpha-blend int))
   "Build the VU1 GIF templates, triple-buffer addresses, instance-data bank addresses, and alpha-test
    states used by TIE. The three GIF output addresses are stored as 2^23-biased floats so VU1 can
@@ -1744,8 +1726,6 @@
   (set! (-> consts misc vector4w y) -1)
   (none))
 
-;; definition for function tie-init-engine
-;; INFO: Return type mismatch int vs none.
 (defun tie-init-engine ((dma-buf dma-buffer) (test-state gs-test) (alpha-blend int))
   "Append the TIE VU1 upload and initialization packets to dma-buf. This installs the requested GS
    TEST state, uploads the constant block, initializes the microprogram, and configures VIF's ROW,
@@ -1810,8 +1790,6 @@
   0
   (none))
 
-;; definition for function tie-end-buffer
-;; INFO: Return type mismatch int vs none.
 (defun tie-end-buffer ((dma-buf dma-buffer))
   "Append the TIE shutdown packets, restoring the normal GS TEST state and clearing the VIF mask,
    mode, and ROW state changed by tie-init-engine."
@@ -1864,7 +1842,6 @@
 ;; the wrong pair. The tables are original code and are left exactly as they are; the aliases in the
 ;; microprogram follow the instructions instead.
 
-;; definition (debug) for function tie-int-reg
 (defun-debug tie-int-reg ((register-index int))
   "Return the source name assigned to a TIE VU1 integer register."
   (let ((i register-index))
@@ -1886,7 +1863,6 @@
       ((= i 14) "skip-ips")
       ((= i 15) "kick-addr"))))
 
-;; definition (debug) for function tie-float-reg
 (defun-debug tie-float-reg ((register-index int))
   "Return the source name assigned to a TIE VU1 floating-point register."
   (let ((i register-index))
@@ -1924,9 +1900,6 @@
       ((= i 30) "clr2")
       ((= i 31) "--"))))
 
-;; definition (debug) for function tie-ints
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch symbol vs none.
 (defun-debug tie-ints ()
   "Print the saved TIE VU1 integer-register values with their source names."
   (let ((register-data (the-as (pointer uint32) (+ #x3fa0 #x1100c000))))
@@ -1935,9 +1908,6 @@
       (format 0 "vi~d: ~6d #x~4,'0X ~s~%" i (-> register-data (* i 4)) (-> register-data (* i 4)) (tie-int-reg i))))
   (none))
 
-;; definition (debug) for function tie-floats
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch symbol vs none.
 (defun-debug tie-floats ()
   "Print the saved TIE VU1 floating-point-register values, as words and floats, with their source
    names."
diff --git a/goal_src/jak1/engine/nav/navigate.gc b/goal_src/jak1/engine/nav/navigate.gc
index 80faa02d20..c4e649a891 100644
--- a/goal_src/jak1/engine/nav/navigate.gc
+++ b/goal_src/jak1/engine/nav/navigate.gc
@@ -14,38 +14,26 @@
 
 ;; DECOMP BEGINS
 
-;; definition for symbol *nav-timer*, type stopwatch
 (define *nav-timer* (new 'global 'stopwatch))
 
-;; definition for symbol *travel-timer*, type stopwatch
 (define *travel-timer* (new 'global 'stopwatch))
 
-;; definition for symbol *clip-for-spheres-timer*, type stopwatch
 (define *clip-for-spheres-timer* (new 'global 'stopwatch))
 
-;; definition for symbol *find-poly-timer*, type stopwatch
 (define *find-poly-timer* (new 'global 'stopwatch))
 
-;; definition for symbol *nav-timer-enable*, type symbol
 (define *nav-timer-enable* #t)
 
-;; definition for symbol *nav-patch-route-table*, type symbol
 (define *nav-patch-route-table* #t)
 
-;; definition for symbol *nav-triangle-test-count*, type int
 (define *nav-triangle-test-count* 0)
 
-;; definition for symbol *nav-last-triangle-test-count*, type int
 (define *nav-last-triangle-test-count* 0)
 
-;; definition for symbol *debug-traverse*, type int
 (define *debug-traverse* 0)
 
-;; definition for symbol *debug-tests*, type int
 (define *debug-tests* 0)
 
-;; definition for function pke-nav-hack
-;; INFO: Return type mismatch int vs none.
 (defun pke-nav-hack ()
   "Print and reset the navigation traversal and triangle-test debug counters."
   (format *stdcon* "travs: ~d, tests: ~d~%" *debug-traverse* *debug-tests*)
@@ -54,97 +42,65 @@
   0
   (none))
 
-;; definition for function debug-report-nav-stats
-;; INFO: Return type mismatch int vs none.
 (defun debug-report-nav-stats ()
   "Empty navigation-statistics hook."
   0
   (none))
 
-;; definition for symbol *debug-output*, type symbol
 (define *debug-output* #f)
 
-;; definition for symbol *debug-nav*, type symbol
 (define *debug-nav* #t)
 
-;; definition for symbol *debug-nav-ray*, type nav-ray
 (define *debug-nav-ray* (the-as nav-ray #f))
 
-;; definition for symbol *debug-ray-offset*, type vector
 (define *debug-ray-offset* (new 'static 'vector))
 
-;; definition for symbol *debug-nav-travel*, type symbol
 (define *debug-nav-travel* #f)
 
-;; definition for symbol *color-black*, type rgba
 (define *color-black* (new 'static 'rgba :a #x80))
 
-;; definition for symbol *color-white*, type rgba
 (define *color-white* (new 'static 'rgba :r #xff :g #xff :b #xff :a #x80))
 
-;; definition for symbol *color-gray*, type rgba
 (define *color-gray* (new 'static 'rgba :r #x80 :g #x80 :b #x80 :a #x80))
 
-;; definition for symbol *color-red*, type rgba
 (define *color-red* (new 'static 'rgba :r #xff :a #x80))
 
-;; definition for symbol *color-green*, type rgba
 (define *color-green* (new 'static 'rgba :g #xff :a #x80))
 
-;; definition for symbol *color-blue*, type rgba
 (define *color-blue* (new 'static 'rgba :b #xff :a #x80))
 
-;; definition for symbol *color-cyan*, type rgba
 (define *color-cyan* (new 'static 'rgba :g #xff :b #xff :a #x80))
 
-;; definition for symbol *color-magenta*, type rgba
 (define *color-magenta* (new 'static 'rgba :r #xff :b #xff :a #x80))
 
-;; definition for symbol *color-yellow*, type rgba
 (define *color-yellow* (new 'static 'rgba :r #xff :g #xff :a #x80))
 
-;; definition for symbol *color-light-red*, type rgba
 (define *color-light-red* (new 'static 'rgba :r #xff :g #x80 :b #x80 :a #x80))
 
-;; definition for symbol *color-light-green*, type rgba
 (define *color-light-green* (new 'static 'rgba :r #x80 :g #xff :b #x80 :a #x80))
 
-;; definition for symbol *color-light-blue*, type rgba
 (define *color-light-blue* (new 'static 'rgba :r #x80 :g #x80 :b #xff :a #x80))
 
-;; definition for symbol *color-light-cyan*, type rgba
 (define *color-light-cyan* (new 'static 'rgba :r #x80 :g #xff :b #xff :a #x80))
 
-;; definition for symbol *color-light-magenta*, type rgba
 (define *color-light-magenta* (new 'static 'rgba :r #xff :g #x80 :b #xff :a #x80))
 
-;; definition for symbol *color-light-yellow*, type rgba
 (define *color-light-yellow* (new 'static 'rgba :r #xff :g #xff :b #x80 :a #x80))
 
-;; definition for symbol *color-dark-red*, type rgba
 (define *color-dark-red* (new 'static 'rgba :r #x80 :a #x80))
 
-;; definition for symbol *color-dark-green*, type rgba
 (define *color-dark-green* (new 'static 'rgba :g #x80 :a #x80))
 
-;; definition for symbol *color-dark-blue*, type rgba
 (define *color-dark-blue* (new 'static 'rgba :b #x80 :a #x80))
 
-;; definition for symbol *color-dark-cyan*, type rgba
 (define *color-dark-cyan* (new 'static 'rgba :g #x80 :b #x80 :a #x80))
 
-;; definition for symbol *color-dark-magenta*, type rgba
 (define *color-dark-magenta* (new 'static 'rgba :r #x80 :b #x80 :a #x80))
 
-;; definition for symbol *color-dark-yellow*, type rgba
 (define *color-dark-yellow* (new 'static 'rgba :r #x80 :g #x80 :a #x80))
 
-;; definition for symbol *color-orange*, type rgba
 (define *color-orange* (new 'static 'rgba :r #xff :g #x80 :a #x80))
 
-;; definition for function entity-nav-login
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defun entity-nav-login ((entity entity-actor))
   "Initialize actor's shared navigation mesh and route table on first use, then attach any authored
    static obstacle-sphere array."
@@ -164,19 +120,15 @@
   0
   (none))
 
-;; definition for method 4 of type nav-control
 (defmethod length ((this nav-control))
   "Return the number of avoidance spheres currently stored."
   (-> this num-spheres))
 
-;; definition for method 5 of type nav-control
-;; INFO: Return type mismatch uint vs int.
 (defmethod asize-of ((this nav-control))
   "Return the fixed navigation-control size plus sixteen bytes for each
    reserved avoidance-sphere slot."
   (the-as int (+ (-> nav-control size) (* (-> this max-spheres) 16))))
 
-;; definition for symbol *default-nav-mesh*, type nav-mesh
 (define *default-nav-mesh*
   (new 'static
        'nav-mesh
@@ -218,17 +170,13 @@
             (new 'static 'vector4ub)
             (new 'static 'vector4ub))))
 
-;; failed to figure out what this is:
 (let ((mesh *default-nav-mesh*))
   (if (zero? (-> mesh user-list)) (set! (-> mesh user-list) (new 'global 'engine 'nav-engine 32))))
 
-;; definition for method 4 of type nav-mesh
 (defmethod length ((this nav-mesh))
   "Return the number of navigation triangles."
   (-> this poly-count))
 
-;; definition for method 20 of type nav-mesh
-;; INFO: Return type mismatch int vs none.
 (defmethod debug-draw-poly ((this nav-mesh) (poly nav-poly) (color rgba))
   "Draw one navigation triangle with color."
   (let ((origin (-> this origin))
@@ -259,14 +207,10 @@
   0
   (none))
 
-;; definition for symbol *nav-one-third*, type vector
 (define *nav-one-third* (new 'global 'vector))
 
-;; failed to figure out what this is:
 (set! (-> *nav-one-third* x) 0.33333334)
 
-;; definition for method 10 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod tri-centroid-local ((this nav-mesh) (poly nav-poly) (result vector))
   "Store poly's mesh-local centroid in result."
   (set! (-> result quad) (-> this vertex (-> poly vertex 0) quad))
@@ -274,22 +218,17 @@
   (vector+! result result (the-as vector (-> this vertex (-> poly vertex 2))))
   (vector-float*! result result 0.333333))
 
-;; definition for method 9 of type nav-mesh
 (defmethod tri-centroid-world ((this nav-mesh) (poly nav-poly) (result vector))
   "Store poly's world-space centroid in result."
   (tri-centroid-local this poly result)
   (vector+! result result (-> this origin)))
 
-;; definition for symbol *edge-vert0-table*, type (array int8)
 (define *edge-vert0-table* (new 'static 'boxed-array :type int8 1 2 0))
 
-;; definition for symbol *edge-vert1-table*, type (array int8)
 (define *edge-vert1-table* (new 'static 'boxed-array :type int8 2 0 1))
 
-;; definition for symbol *edge-mask-table*, type (array int8)
 (define *edge-mask-table* (new 'static 'boxed-array :type int8 1 2 4))
 
-;; definition for function inc-mod3
 (defun inc-mod3 ((index int))
   "Return the next cyclic triangle-edge index for an input in the range zero through two."
   (local-vars (result int) (past-end int))
@@ -298,7 +237,6 @@
     (move-if-not-zero result 0 past-end next-index))
   result)
 
-;; definition for function dec-mod3
 (defun dec-mod3 ((index int))
   "Return the previous cyclic triangle-edge index for an input in the range zero through two."
   (local-vars (result int) (before-start int))
@@ -308,7 +246,6 @@
     (move-if-not-zero result last-index before-start previous-index))
   result)
 
-;; definition for function vu-point-triangle-intersection?
 (defun vu-point-triangle-intersection? ((point vector) (vertex-0 vector) (vertex-1 vector) (vertex-2 vector))
   "Return whether point lies inside the triangle in XZ by comparing its three oriented edge signs;
    Y and W are ignored."
@@ -368,7 +305,6 @@
       (set-on-less-than edge-cross-0-1-match edge-cross-0-1-difference 1))
     (logtest? edge-cross-0-1-match edge-cross-1-2-match)))
 
-;; definition for method 21 of type nav-mesh
 (defmethod point-in-poly? ((this nav-mesh) (poly nav-poly) (point vector))
   "Return whether a mesh-local point lies inside poly in the XZ plane."
   (vu-point-triangle-intersection? point
@@ -376,8 +312,6 @@
                                    (-> this vertex (-> poly vertex 1))
                                    (-> this vertex (-> poly vertex 2))))
 
-;; definition for method 24 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod closest-point-on-boundary ((this nav-mesh) (poly nav-poly) (result vector) (point vector))
   "Store the closest point on poly's perimeter to point."
   (let ((vertices (-> this vertex))
@@ -393,8 +327,6 @@
     (set! (-> result quad) (-> closest-point quad)))
   result)
 
-;; definition for method 26 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod project-point-into-tri-2d ((this nav-mesh) (poly nav-poly) (result vector) (point vector))
   "Store point when it lies inside poly in XZ, otherwise store the
    closest point on the perimeter."
@@ -403,7 +335,6 @@
     (closest-point-on-boundary this poly result point))
   result)
 
-;; definition for function point-inside-rect?
 (defun point-inside-rect? ((node nav-node) (point vector) (y-threshold float))
   "Return whether point lies inside node's XZ bounds and its Y interval overlaps y-threshold around
    the point."
@@ -414,7 +345,6 @@
        (>= (+ (-> point y) y-threshold) (- (-> node center-y) (-> node radius-y)))
        (>= (+ (-> node center-y) (-> node radius-y)) (- (-> point y) y-threshold))))
 
-;; definition for function point-inside-poly?
 (defun point-inside-poly? ((mesh nav-mesh) (poly-index uint) (point vector) (y-threshold float))
   "Return whether point lies inside the indexed non-gap triangle in XZ and within y-threshold of its
    average vertex height."
@@ -483,7 +413,6 @@
               (if (logtest? edge-cross-0-1-match edge-cross-1-2-match) (return #t)))))))
     #f))
 
-;; definition for function recursive-inside-poly
 (defun recursive-inside-poly ((mesh nav-mesh) (node nav-node) (point vector) (y-threshold float))
   "Search a navigation BVH below node for a non-gap triangle containing point within y-threshold.
    Return its triangle index or -1."
@@ -513,8 +442,6 @@
     (the-as none 0))
   -1)
 
-;; definition for method 27 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod find-poly-fast ((this nav-mesh) (point vector) (y-threshold meters))
   "Find the triangle containing a mesh-local point with the BVH and per-frame
    cache, returning #f when no triangle contains it within the Y threshold."
@@ -554,7 +481,6 @@
           (return (-> this poly poly-index))))))
   (the-as nav-poly #f))
 
-;; definition for function circle-triangle-intersection-proc?
 (defun circle-triangle-intersection-proc? ((center vector) (radius float) (vertices (inline-array nav-vertex)))
   "Return whether the XZ circle overlaps the triangle in vertices. This is the reference version of
    circle-triangle-intersection?."
@@ -600,7 +526,6 @@
                (distance-squared (+ (square (- (-> selected-vertex x) (-> center x))) (square (- (-> selected-vertex z) (-> center z))))))
           (if (>= (square radius) distance-squared) #t))))))
 
-;; definition for function circle-triangle-intersection?
 (defun circle-triangle-intersection? ((center vector) (radius float) (vertices (inline-array nav-vertex)))
   "Return whether the XZ circle overlaps the triangle in vertices, including edge and vertex
    contact."
@@ -646,7 +571,6 @@
                (distance-squared (+ (square (- (-> selected-vertex x) (-> center x))) (square (- (-> selected-vertex z) (-> center z))))))
           (if (>= (square radius) distance-squared) #t))))))
 
-;; definition for method 29 of type nav-mesh
 (defmethod is-in-mesh? ((this nav-mesh) (center vector) (radius float) (y-threshold meters))
   "Return whether a mesh-local XZ circle overlaps any non-gap triangle within the Y
    threshold."
@@ -710,9 +634,6 @@
                   (if (circle-triangle-intersection? center radius triangle-data) (return #t)))))))))
     #f))
 
-;; definition for method 14 of type nav-mesh
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod move-along-nav-ray! ((this nav-mesh) (ray nav-ray))
   "Advance ray across one triangle edge and update its termination,
    boundary, destination, or gap state."
@@ -759,7 +680,6 @@
   0
   (none))
 
-;; definition for function init-ray
 (defun init-ray ((ray nav-ray))
   "Reset ray's length and termination results, and normalize its current-to-destination XZ
    direction."
@@ -775,8 +695,6 @@
   (set! (-> ray hit-gap) #f)
   #f)
 
-;; definition for function init-ray-local
-;; INFO: Used lq/sq
 (defun init-ray-local ((ray nav-ray) (poly nav-poly) (start-position vector) (destination vector))
   "Initialize ray at start in start-poly with a mesh-local destination."
   (set! (-> ray current-pos quad) (-> start-position quad))
@@ -784,8 +702,6 @@
   (set! (-> ray current-poly) poly)
   (init-ray ray))
 
-;; definition for function init-ray-dir-local
-;; INFO: Used lq/sq
 (defun init-ray-dir-local ((ray nav-ray) (poly nav-poly) (start-position vector) (direction vector) (distance float))
   "Initialize ray at start in start-poly with a mesh-local direction and distance."
   (set! (-> ray current-poly) poly)
@@ -793,7 +709,6 @@
   (vector+*! (-> ray dest-pos) (-> ray current-pos) direction distance)
   (init-ray ray))
 
-;; definition for method 15 of type nav-mesh
 (defmethod try-move-along-ray ((this nav-mesh) (poly nav-poly) (start-position vector) (direction vector) (distance float))
   "Walk an XZ ray from start-poly toward direction for distance, stopping at
    the destination, a boundary or gap, or after fifteen triangles. Return the distance traveled."
@@ -807,7 +722,6 @@
         (set! done (or (>= iteration 15) (-> ray terminated)))))
     (-> ray len)))
 
-;; definition for function nav-ray-test
 (defun nav-ray-test ((mesh nav-mesh) (poly nav-poly) (start-position vector) (destination vector))
   "Convert the world-space start position to mesh-local space, then walk toward the world-space
    destination from start-poly. Return the XZ distance traveled before reaching the destination, a
@@ -820,7 +734,6 @@
       (vector-xz-normalize! direction 1.0)
       (try-move-along-ray mesh poly start-local direction distance))))
 
-;; definition for function nav-ray-test-local?
 (defun nav-ray-test-local? ((mesh nav-mesh) (poly nav-poly) (start-position vector) (destination vector))
   "Return whether a mesh-local ray from start to destination reaches its destination before a
    boundary or gap."
@@ -834,8 +747,6 @@
         (set! done (or (>= iteration 15) (-> ray terminated)))))
     (-> ray reached-dest)))
 
-;; definition for function nav-mesh-update-route-table
-;; INFO: Return type mismatch int vs uint.
 ;; Route entries are packed four per byte. An entry from A to B is at
 ;; ((B + A * poly-count) * 2); values zero through two select A's next edge, and three means no
 ;; intermediate portal is required.
@@ -851,22 +762,16 @@
     (set! (-> (the-as (pointer uint8) (-> mesh route)) byte-index) (the-as uint new-byte))
     (the-as uint new-byte)))
 
-;; definition for function nav-mesh-lookup-route
 (defun nav-mesh-lookup-route ((mesh nav-mesh) (to-poly int) (from-poly int))
   "Return the packed two-bit route entry from from-poly to to-poly. The argument order matches the
    table's to-then-from lookup convention."
   (let ((bit-position (* (+ to-poly (* from-poly (-> mesh poly-count))) 2)))
     (logand (ash (-> (the-as (pointer uint8) (-> mesh route)) (/ bit-position 8)) (- (logand bit-position 7))) 3)))
 
-;; definition for symbol *nav-update-route-table-ray-count*, type int
 (define *nav-update-route-table-ray-count* 0)
 
-;; definition for symbol *nav-update-route-table-route-count*, type int
 (define *nav-update-route-table-route-count* 0)
 
-;; definition for method 18 of type nav-mesh
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod build-route-table-recursive ((this nav-mesh) (from-poly int) (source-centroid vector) (current-poly int) (visited (pointer int8)) (depth int))
   "Mark current-poly as directly reachable from from-poly. With a
    positive depth budget, continue through unvisited non-gap neighbors whose centroids are visible
@@ -894,8 +799,6 @@
   0
   (none))
 
-;; definition for method 17 of type nav-mesh
-;; INFO: Return type mismatch int vs none.
 ;; The authored table already contains the longer routes. Make every directly adjacent non-gap
 ;; pair explicit as direct travel so path following does not introduce an unnecessary portal.
 (defmethod update-route-table ((this nav-mesh))
@@ -924,7 +827,6 @@
   0
   (none))
 
-;; definition for function point-triangle-distance-min
 ;; Classify the point into the triangle's XZ Voronoi regions. The three edge signs identify the
 ;; interior, an edge region, or a corner region, allowing the caller's current best distance to
 ;; reject a triangle before the more expensive corner calculation.
@@ -977,8 +879,6 @@
                 (fmin (sqrtf (+ (square (- (-> corner x) (-> point x))) (square (- (-> corner z) (-> point z))))) max-distance)))))
     best-distance))
 
-;; definition for method 28 of type nav-mesh
-;; INFO: Used lq/sq
 ;; Prefer the BVH containment result. A point outside the mesh falls back to the closest non-gap
 ;; triangle within the requested height window so callers can still project it onto a boundary.
 (defmethod find-poly ((this nav-mesh) (point vector) (y-threshold meters) (flags (pointer nav-control-flags)))
@@ -1009,7 +909,6 @@
   (label cfg-14)
   best-poly)
 
-;; definition for method 12 of type nav-mesh
 (defmethod setup-portal ((this nav-mesh) (current-poly nav-poly) (target-poly nav-poly) (portal nav-route-portal))
   "Fill portal with the next routed edge and its neighboring triangle. Leave it
    without a next triangle when current-poly can travel directly toward target-poly or has no stored
@@ -1037,7 +936,6 @@
              #t)))))
     (else 0)))
 
-;; definition for method 11 of type nav-mesh
 (defmethod get-adj-poly ((this nav-mesh) (current-poly nav-poly) (target-poly nav-poly) (vertex-pair symbol))
   "Return the next triangle selected by the route from current-poly toward
    target-poly. If vertex-pair is non-false, store the two shared vertex indices packed into its value
@@ -1063,8 +961,6 @@
           (-> this poly neighbor-index)))))
     (else (the-as nav-poly #f))))
 
-;; definition for method 19 of type nav-mesh
-;; INFO: Return type mismatch int vs none.
 (defmethod compute-bounding-box ((this nav-mesh) (minimum vector) (maximum vector))
   "Store the world-space minimum and maximum vertex bounds."
   (let ((huge 10000000000000000000000000000000000000.0)
@@ -1088,9 +984,6 @@
   0
   (none))
 
-;; definition for method 13 of type nav-mesh
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod initialize-mesh! ((this nav-mesh))
   "Validate the loaded mesh, warning about empty, degenerate, downward-facing,
    oversized, or all-gap triangle data."
@@ -1140,7 +1033,6 @@
     0
     (none)))
 
-;; definition for method 22 of type nav-mesh
 (defmethod find-opposite-vertices ((this nav-mesh) (poly-a nav-poly) (poly-b nav-poly))
   "Pack the two shared-edge vertex indices of adjacent triangles, or
    #xffffffff when they do not share an oriented edge."
@@ -1154,7 +1046,6 @@
                 (return (logior next-vertex (shl (-> poly-a vertex a-index) 16))))))))))
   (the-as uint #xffffffff))
 
-;; definition for function ray-ccw-line-segment-intersection?
 (defun ray-ccw-line-segment-intersection? ((point vector) (direction vector) (segment-start vector) (segment-end vector))
   "Return whether the XZ ray from origin along direction crosses the directed segment from start to
    end on its counter-clockwise side."
@@ -1171,7 +1062,6 @@
           (set! intersects (< 0.0 orientation)))))
     intersects))
 
-;; definition for function ray-line-segment-intersection?
 (defun ray-line-segment-intersection? ((point vector) (direction vector) (segment-start vector) (segment-end vector))
   "Return whether the XZ ray from origin along direction intersects the segment from start to end,
    independent of segment winding."
@@ -1190,10 +1080,8 @@
             (set! intersects #t)))))
     intersects))
 
-;; definition for symbol *debug-offset*, type vector
 (define *debug-offset* (new 'static 'vector :y 4096.0 :w 1.0))
 
-;; definition for function clip-vector-to-halfspace!
 (defun clip-vector-to-halfspace! ((travel vector) (normal-x float) (normal-z float) (limit float))
   "If travel's XZ projection onto the supplied normal exceeds limit, scale its X and Z components
    uniformly so the projection equals limit. Leave Y unchanged; callers use the mutation rather
@@ -1204,8 +1092,6 @@
         (set! (-> travel x) (* (-> travel x) fraction))
         (set! (-> travel z) (* (-> travel z) fraction))))))
 
-;; definition for method 23 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod clip-travel-to-poly ((this nav-mesh) (poly nav-poly) (start-position vector) (result-travel vector) (desired-travel vector) (portal nav-route-portal))
   "Clip desired-travel against one triangle in XZ, store it in result-travel,
    and record the crossed neighbor in portal. At a boundary corner, a start point within five
@@ -1259,8 +1145,6 @@
   (set! (-> result-travel y) (-> start-position y))
   result-travel)
 
-;; definition for method 25 of type nav-mesh
-;; INFO: Used lq/sq
 (defmethod project-point-into-tri-3d ((this nav-mesh) (poly nav-poly) (result vector) (point vector))
   "Project point onto poly's 3D plane and store the result."
   (let ((normal (new 'stack-no-clear 'vector))
@@ -1274,8 +1158,6 @@
     (closest-pt-in-triangle result point triangle normal))
   (none))
 
-;; definition for method 17 of type nav-control
-;; INFO: Used lq/sq
 (defmethod project-onto-nav-mesh ((this nav-control) (result vector) (point vector))
   "Store a world-space point projected onto the navigation mesh."
   (let* ((mesh (-> this mesh))
@@ -1287,7 +1169,6 @@
       (else (closest-point-on-boundary mesh poly result point-local) (vector+! result result (-> mesh origin)))))
   result)
 
-;; definition for method 18 of type nav-control
 (defmethod find-poly ((this nav-control) (point vector))
   "Find the navigation triangle containing a world-space point."
   (find-poly (-> this mesh)
@@ -1295,7 +1176,6 @@
              (-> this nearest-y-threshold)
              (the-as (pointer nav-control-flags) #f)))
 
-;; definition for method 20 of type nav-control
 (defmethod project-point-into-tri-3d ((this nav-control) (poly nav-poly) (result vector) (point vector))
   "Project a world-space point onto poly and store the world-space
    result."
@@ -1306,16 +1186,12 @@
   (vector+! result result (-> this mesh origin))
   result)
 
-;; definition for method 25 of type nav-control
 (defmethod is-in-mesh? ((this nav-control) (point vector) (radius float))
   "Return whether a world-space circle overlaps the navigation mesh."
   (let ((point-local (vector-! (new 'stack-no-clear 'vector) point (-> this mesh origin)))
         (mesh (-> this mesh)))
     (is-in-mesh? mesh point-local radius (-> this nearest-y-threshold))))
 
-;; definition for method 9 of type nav-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod debug-draw ((this nav-control))
   "Draw the enabled mesh, route, travel, and obstacle-sphere debug layers."
   (let ((control this))
@@ -1456,8 +1332,6 @@
       0))
   (none))
 
-;; definition for method 8 of type nav-mesh
-;; INFO: Return type mismatch int vs nav-mesh.
 (defmethod mem-usage ((this nav-mesh) (usage memory-usage-block) (flags int))
   "Add the mesh object, vertex array, triangle array, and packed route
    table allocations to the navigation memory-usage bucket."
@@ -1487,8 +1361,6 @@
     (+! (-> usage data 45 total) (logand -16 (+ route-bytes 15))))
   (the-as nav-mesh 0))
 
-;; definition for method 14 of type nav-control
-;; INFO: Return type mismatch int vs none.
 (defmethod set-current-poly! ((this nav-control) (poly nav-poly))
   "Set the current triangle and mark it as explicitly supplied this frame."
   (set! (-> this current-poly) poly)
@@ -1496,7 +1368,6 @@
   0
   (none))
 
-;; definition for method 30 of type nav-control
 (defmethod find-deepest-sphere-along-ray ((this nav-control) (ray-origin vector) (ray-direction vector) (hit-position vector))
   "Return the avoidance sphere most deeply overlapped by the ray,
    or #f when there is no hit."
@@ -1511,14 +1382,11 @@
       (set! (-> hit-position x) best-hit-distance))
     best-sphere))
 
-;; definition for method 31 of type nav-control
 (defmethod intersect-ray-line-segment? ((this nav-control) (point vector) (direction vector) (segment-start vector) (segment-end vector))
   "Return whether the XZ ray from point along direction intersects
    the finite segment."
   (ray-line-segment-intersection? point direction segment-start segment-end))
 
-;; definition for function add-nav-sphere
-;; INFO: Return type mismatch int vs none.
 (defun add-nav-sphere ((control nav-control) (world-sphere vector))
   "Append a world-space obstacle sphere to control in mesh-local coordinates when capacity permits."
   (when (< (-> control num-spheres) (-> control max-spheres))
@@ -1532,9 +1400,6 @@
   0
   (none))
 
-;; definition for function add-collide-shape-spheres
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defun add-collide-shape-spheres ((control nav-control) (shape collide-shape) (body-sphere vector))
   "Append shape's enabled body and extra navigation spheres to control, combining each radius with
    the navigating body's radius and rejecting spheres beyond the ten-meter cull range."
@@ -1565,9 +1430,6 @@
     0)
   (none))
 
-;; definition for method 28 of type nav-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 ;; The steering pass consumes one compact mesh-local sphere array. Rebuild it from the player,
 ;; authored static obstacles, and the other live navigation users, combining every obstacle radius
 ;; with this body's navigation radius and culling anything farther than ten meters.
@@ -1659,8 +1521,6 @@
   0
   (none))
 
-;; definition for method 35 of type nav-control
-;; INFO: Return type mismatch symbol vs none.
 (defmethod avoid-spheres-world ((this nav-control) (result-travel vector) (world-position vector) (desired-travel vector) (fallback-direction vector) (unused float))
   "Deflect travel around spheres using a world-space start position."
   (let ((local-position (new 'stack-no-clear 'vector)))
@@ -1668,12 +1528,10 @@
     (avoid-spheres this result-travel local-position desired-travel fallback-direction unused))
   (none))
 
-;; definition of type cfs-travel-vec
 (deftype cfs-travel-vec (structure)
   ((dir         vector :inline)
    (delta-angle float)))
 
-;; definition of type cfs-work
 (deftype cfs-work (structure)
   ((desired-travel-dist float)
    (desired-angle       float)
@@ -1689,7 +1547,6 @@
    (attempt-dir         vector :inline)
    (tangent             vector 2 :inline)))
 
-;; definition of type nav-control-cfs-work
 (deftype nav-control-cfs-work (structure)
   ((in-dir              vector :inline)
    (right-dir           vector :inline)
@@ -1711,8 +1568,6 @@
    (dir-update          basic)
    (debug-offset        vector :inline)))
 
-;; definition for function circle-tangent-directions
-;; INFO: Used lq/sq
 ;; The tangent direction is the sum of a component toward the center and a perpendicular component.
 ;; Their magnitudes are the legs of the right triangle formed by point, circle center, and tangency
 ;; point; changing the perpendicular sign produces the left and right candidates.
@@ -1741,7 +1596,6 @@
         (vector+*! result-left along-component perpendicular-direction perpendicular-fraction)
         (vector+*! result-right along-component perpendicular-direction (- perpendicular-fraction))))))
 
-;; definition for function find-closest-circle-ray-intersection
 (defun find-closest-circle-ray-intersection ((start-position vector)
         (direction vector)
         (length float)
@@ -1763,14 +1617,12 @@
               (set! best-index sphere-index))))))
     best-index))
 
-;; definition for function sign-bit
 (defun sign-bit ((value int))
   "Return one when value's low 32-bit signed representation is negative, otherwise zero."
   (local-vars (shifted-sign int))
   (let ((value-copy value)) (shift-arith-right-32 shifted-sign value-copy 31))
   (logand shifted-sign 1))
 
-;; definition for function compute-dir-parm
 (defun compute-dir-parm ((direction vector) (input-direction vector) (right-direction vector))
   "Return a signed turn cost for direction: one minus its dot product with input-direction, with the
    sign selected by which side of right-direction it lies on."
@@ -1779,8 +1631,6 @@
     (let ((right-dot-bits (vector-dot direction right-direction))) (shift-arith-right-32 right-dot-sign right-dot-bits 31))
     (* (-> sign-selector data (logand right-dot-sign 1)) (- 1.0 (vector-dot direction input-direction)))))
 
-;; definition for method 32 of type nav-control
-;; INFO: Used lq/sq
 ;; Follow a tangent chain on both sides of the obstacle set. Each candidate begins at the first
 ;; sphere on the straight path, chooses the tangent with the smaller turn from the input direction,
 ;; and repeats until that ray is clear. When the start lies inside a sphere, blend both candidates
@@ -1901,7 +1751,6 @@
   (label cfg-46)
   deflected)
 
-;; definition for method 23 of type nav-control
 (defmethod check-vector-collision-with-nav-spheres ((this nav-control) (travel-direction vector) (info check-vector-collision-with-nav-spheres-info))
   "Find the nearest forward avoidance-sphere hit along
    travel-direction. Return its ray parameter and, when info is supplied, store the world-space
@@ -1931,8 +1780,6 @@
           (vector-normalize! (-> info normal) 1.0))))
     best-hit-distance))
 
-;; definition for method 33 of type nav-control
-;; INFO: Used lq/sq
 (defmethod avoid-spheres-and-detect-blocked ((this nav-control) (result-travel vector) (start-position vector) (desired-travel vector) (fallback-direction vector) (unused float))
   "Deflect travel around spheres. If the resulting travel is no
    longer than the original and is under five centimeters, set the blocked state, update its timer and
@@ -1948,27 +1795,18 @@
           (if (-> this block-event) (send-event (the-as process-tree (-> this process)) (the-as symbol (-> this block-event)) this))))
       #t)))
 
-;; definition for symbol *debug-ray-test*, type nav-ray
 (define *debug-ray-test* (the-as nav-ray #f))
 
-;; definition for symbol *debug-ray-test-capture-mode*, type symbol
 (define *debug-ray-test-capture-mode* #f)
 
-;; definition for symbol *debug-ray-test-capture-output*, type symbol
 (define *debug-ray-test-capture-output* #f)
 
-;; definition for symbol *test-ray-start-poly-id*, type int
 (define *test-ray-start-poly-id* 62)
 
-;; definition for symbol *test-ray-src-pos*, type vector
 (define *test-ray-src-pos* (new 'static 'vector :x -705089.6 :y 9769.325 :z -963339.0 :w 1.0))
 
-;; definition for symbol *test-ray-dest-pos*, type vector
 (define *test-ray-dest-pos* (new 'static 'vector :x -722887.7 :y 9532.475 :z -958862.25 :w 1.0))
 
-;; definition for method 19 of type nav-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch vector vs none.
 (defmethod steer-toward-point ((this nav-control) (result-position vector) (body collide-shape-moving) (goal vector) (turn-speed float))
   "Turn body toward goal by at most turn-speed while validating the proposed
    step remains on the mesh; store the accepted position in out-pos."
@@ -1995,7 +1833,6 @@
          (set! (-> result-position quad) (-> goal quad))))))
   (none))
 
-;; definition for method 16 of type nav-control
 (defmethod find-poly-fast-from-world ((this nav-control) (world-point vector))
   "Find the triangle containing a world-space point using the mesh's
    fast lookup."
@@ -2003,7 +1840,6 @@
                   (vector-! (new 'stack-no-clear 'vector) world-point (-> this mesh origin))
                   (-> this nearest-y-threshold)))
 
-;; definition for method 21 of type nav-control
 (defmethod find-poly-fast-at ((this nav-control) (world-point vector))
   "Find the triangle containing a world-space point using the mesh's fast
    lookup."
@@ -2011,8 +1847,6 @@
                   (vector-! (new 'stack-no-clear 'vector) world-point (-> this mesh origin))
                   (-> this nearest-y-threshold)))
 
-;; definition for method 22 of type nav-control
-;; INFO: Return type mismatch structure vs symbol.
 (defmethod point-on-mesh-below? ((this nav-control) (world-point vector) (y-tolerance float))
   "Return whether world-point lies in a mesh triangle and below the mesh
    origin plus y-tolerance."
@@ -2022,7 +1856,6 @@
                                (-> this nearest-y-threshold))
                (< (-> world-point y) (+ (-> this mesh origin y) y-tolerance)))))
 
-;; definition for function debug-nav-validate-current-poly
 (defun debug-nav-validate-current-poly ((mesh nav-mesh) (current-poly nav-poly) (point vector))
   "Debug hook for validating current-poly. When point lies outside it, project point to the triangle
    and compute the XZ miss distance for inspection; the hook returns #f."
@@ -2032,16 +1865,11 @@
       (vector-vector-xz-distance point projected-point))
     #f))
 
-;; definition for method 26 of type nav-control
-;; INFO: Return type mismatch int vs none.
 (defmethod post-relocalize-hook ((this nav-control))
   "Hook called after the control is relocalized on the mesh."
   0
   (none))
 
-;; definition for method 27 of type nav-control
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 (defmethod relocalize-in-mesh! ((this nav-control))
   "Update current-poly by ray-walking from the previous body position to its
    current position."
@@ -2075,9 +1903,6 @@
   0
   (none))
 
-;; definition for method 16 of type nav-mesh
-;; INFO: Used lq/sq
-;; INFO: Return type mismatch int vs none.
 ;; Walk the requested segment through adjacent triangles. A gap ends the walk for the caller to
 ;; handle. At a solid boundary, either stop or subtract the into-wall component and make one more
 ;; pass along the wall; the 1.01 factor leaves the new ray slightly inside the legal half-space.
@@ -2140,8 +1965,6 @@
   0
   (none))
 
-;; definition for method 24 of type nav-control
-;; INFO: Return type mismatch int vs none.
 (defmethod clip-travel-to-mesh ((this nav-control) (max-distance float) (info clip-travel-vector-to-mesh-return-info))
   "Clip this control's travel to the mesh up to max-distance and fill
    boundary or gap details."
@@ -2159,7 +1982,6 @@
   0
   (none))
 
-;; definition for function test-xz-point-on-line-segment?
 (defun test-xz-point-on-line-segment? ((point vector) (segment-start vector) (segment-end vector) (tolerance float))
   "Return whether point is within tolerance of the finite XZ segment. Endpoint proximity is tested
    first; otherwise the perpendicular projection must lie between segment-start and segment-end."
@@ -2179,7 +2001,6 @@
             (set! within-tolerance (and (>= projection 0.0) (>= (square segment-length) projection)))))))
     within-tolerance))
 
-;; definition for function choose-travel-portal-vertex
 ;; Use the current portal's perpendicular bisector to discover which way the later portal chain
 ;; bends. A later edge wholly on one side selects the matching current endpoint; if the chain ends,
 ;; the target's nearer endpoint supplies the final side test.
@@ -2238,8 +2059,6 @@
              0))))
       chosen-vertex)))
 
-;; definition for method 13 of type nav-control
-;; INFO: Used lq/sq
 ;; Walk the precomputed portal chain from current-poly toward target-poly while the body remains
 ;; within ten centimeters of each portal. Aim through the next portal or around its chosen endpoint,
 ;; then apply sphere avoidance and clip the result back to the mesh.
@@ -2314,8 +2133,6 @@
   (set! (-> this travel y) 0.0)
   (-> this travel))
 
-;; definition for method 12 of type nav-control
-;; INFO: Used lq/sq
 (defmethod find-gap-landing ((this nav-control) (gap-info nav-gap-info))
   "Find the first non-gap triangle beyond the current gap chain and fill the
    landing point. Return #t when a landing exists."
@@ -2332,18 +2149,14 @@
         (set! (-> gap-info poly) poly)
         #t))))
 
-;; definition for function start-collect-nav
 (defun start-collect-nav ()
   "Begin performance-counter bucket 14 for navigation work."
   (reset! (-> *perf-stats* data 14)))
 
-;; definition for function end-collect-nav
 (defun end-collect-nav ()
   "End performance-counter bucket 14 and accumulate both selected EE counters."
   (read! (-> *perf-stats* data 14)))
 
-;; definition for method 11 of type nav-control
-;; INFO: Used lq/sq
 ;; Relocalize first so every later query uses the body's current triangle, rebuild dynamic
 ;; obstacles, and compute this frame's planar travel. Very short travel either reports the landing
 ;; across a gap or marks the destination reached; the obstacle pass reports blocked motion itself.
@@ -2376,8 +2189,6 @@
         (else (logior! (-> this flags) (nav-control-flags reached-destination))))))
   (-> this travel))
 
-;; definition (debug) for function nav-sphere-from-cam
-;; INFO: Return type mismatch int vs none.
 (defun-debug nav-sphere-from-cam ()
   "Print the current camera position as a SPHEREM authoring form."
   (let ((camera-position (camera-pos)))
diff --git a/goal_src/jak1/levels/beach/pelican.gc b/goal_src/jak1/levels/beach/pelican.gc
index 33d72d547a..a9ba4f7c16 100644
--- a/goal_src/jak1/levels/beach/pelican.gc
+++ b/goal_src/jak1/levels/beach/pelican.gc
@@ -554,7 +554,6 @@
       (anim-loop))
   :post ja-post)
 
-;; INFO: Return type mismatch object vs none.
 (defmethod init-from-entity! ((this pelican) (source-entity entity-actor))
   "Initialize the Pelican's collision, skeleton, shadow, alignment, eight path controls, and
    neck tracking, then resume its circling, nest, explosion, or completed state from the
diff --git a/goal_src/jak1/levels/finalboss/robotboss-part.gc b/goal_src/jak1/levels/finalboss/robotboss-part.gc
index 54ea4c214b..33435f5d66 100644
--- a/goal_src/jak1/levels/finalboss/robotboss-part.gc
+++ b/goal_src/jak1/levels/finalboss/robotboss-part.gc
@@ -7,7 +7,6 @@
 
 ;; DECOMP BEGINS
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-blue-beam
   :id 636
   :flags (use-local-clock)
@@ -40,7 +39,6 @@
    (sp-item 2548)
    (sp-item 2547)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-blue-beam-impact
   :id 637
   :flags (use-local-clock)
@@ -53,7 +51,6 @@
    (sp-item 2683)
    (sp-item 2549)))
 
-;; failed to figure out what this is:
 (defpart 2681
   :init-specs
   ((:texture (hotdot effects))
@@ -74,7 +71,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2683
   :init-specs
   ((:texture (bigpuff effects))
@@ -107,11 +103,9 @@
    (:conerot-x (degrees 0) (degrees 45))
    (:conerot-y (degrees 0) (degrees 360))))
 
-;; failed to figure out what this is:
 (defpart 2684
   :init-specs ((:fade-a -0.07111111)))
 
-;; failed to figure out what this is:
 (defpart 2549
   :init-specs
   ((:texture (starflash effects))
@@ -127,7 +121,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2682
   :init-specs
   ((:texture (hotdot effects))
@@ -153,7 +146,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpart 2545
   :init-specs
   ((:texture (hotdot effects))
@@ -173,7 +165,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 1) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2542
   :init-specs
   ((:texture (hotdot effects))
@@ -195,7 +186,6 @@
    (:timer (seconds 1.5))
    (:flags (die-when-faded glow orbit no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2543
   :init-specs
   ((:texture (lightning effects))
@@ -214,7 +204,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2544
   :init-specs
   ((:texture (lightning effects))
@@ -233,7 +222,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2546
   :init-specs
   ((:texture (hotdot effects))
@@ -253,7 +241,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 1))))
 
-;; failed to figure out what this is:
 (defpart 2548
   :init-specs
   ((:texture (hotdot effects))
@@ -273,7 +260,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2547
   :init-specs
   ((:texture (starflash effects))
@@ -289,7 +275,6 @@
    (:timer (seconds 0.035))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2680
   :init-specs
   ((:texture (starflash effects))
@@ -304,7 +289,6 @@
    (:timer (seconds 0.085))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-blue-blowup
   :id 644
   :flags (use-local-clock)
@@ -315,7 +299,6 @@
    (sp-item 2593 :period (seconds 2) :length (seconds 0.135))
    (sp-item 2594 :period (seconds 2) :length (seconds 0.135))))
 
-;; failed to figure out what this is:
 (defpart 2592
   :init-specs
   ((:texture (hotdot effects))
@@ -343,11 +326,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpart 2595
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0) (:fade-a -1.0666667)))
 
-;; failed to figure out what this is:
 (defpart 2594
   :init-specs
   ((:texture (hotdot effects))
@@ -368,7 +349,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2591
   :init-specs
   ((:texture (starflash effects))
@@ -384,7 +364,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2593
   :init-specs
   ((:texture (bigpuff effects))
@@ -411,11 +390,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 6))))
 
-;; failed to figure out what this is:
 (defpart 2596
   :init-specs ((:fade-r -2.1333334) (:fade-g -1.0666667) (:fade-b 0.0) (:next-time (seconds 0.2)) (:next-launcher 2597)))
 
-;; failed to figure out what this is:
 (defpart 2597
   :init-specs
   ((:fade-r 0.0)
@@ -425,11 +402,9 @@
    (:next-time (seconds 0.5))
    (:next-launcher 2598)))
 
-;; failed to figure out what this is:
 (defpart 2598
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-blue-smoke
   :id 645
   :flags (use-local-clock)
@@ -441,7 +416,6 @@
    (sp-item 2599 :period (seconds 0.05) :length (seconds 0.017))
    (sp-item 2686)))
 
-;; failed to figure out what this is:
 (defpart 2686
   :init-specs
   ((:texture (starflash effects))
@@ -457,7 +431,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2599
   :init-specs
   ((:texture (bigpuff effects))
@@ -483,7 +456,6 @@
    (:next-time (seconds 0.067) (seconds 0.297))
    (:next-launcher 2596)))
 
-;; failed to figure out what this is:
 (defpart 2685
   :init-specs
   ((:texture (hotdot effects))
@@ -511,14 +483,12 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-darkecobomb-launch
   :id 638
   :flags (use-local-clock)
   :bounds (static-bspherem 0 0 0 8)
   :parts ((sp-item 2600 :period (seconds 2) :length (seconds 0.017)) (sp-item 2602 :period (seconds 2) :length (seconds 0.135))))
 
-;; failed to figure out what this is:
 (defpart 2600
   :init-specs
   ((:texture (starflash effects))
@@ -534,7 +504,6 @@
    (:timer (seconds 0.185))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2602
   :init-specs
   ((:texture (bigpuff effects))
@@ -559,7 +528,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 2))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-darkecobomb-glow
   :id 639
   :duration (seconds 3)
@@ -585,7 +553,6 @@
    (sp-item 2752 :flags (auto-rearm start-dead launch-asap) :binding 2672)
    (sp-item 2752 :flags (auto-rearm start-dead launch-asap) :binding 2671)))
 
-;; failed to figure out what this is:
 (defpart 2755
   :init-specs
   ((:texture (hotdot effects))
@@ -601,7 +568,6 @@
    (:flags (die-when-faded glow no-fog))
    (:func 'sparticle-track-root-prim)))
 
-;; failed to figure out what this is:
 (defpart 2752
   :init-specs
   ((:texture (hotdot effects))
@@ -621,7 +587,6 @@
    (:flags (die-when-faded glow orbit no-fog))
    (:func 'sparticle-track-root-prim)))
 
-;; failed to figure out what this is:
 (defpart 2753
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -638,7 +603,6 @@
    (:flags (die-when-faded glow))
    (:func 'sparticle-track-root-prim)))
 
-;; failed to figure out what this is:
 (defpart 2754
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -656,7 +620,6 @@
    (:flags (die-when-faded glow))
    (:func 'sparticle-track-root-prim)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-darkecobomb-tick
   :id 663
   :duration (seconds 3)
@@ -664,7 +627,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2756) (sp-item 2757) (sp-item 2758) (sp-item 2759)))
 
-;; failed to figure out what this is:
 (defpart 2759
   :init-specs
   ((:texture (hotdot effects))
@@ -681,7 +643,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2758
   :init-specs
   ((:texture (lightning3 effects))
@@ -701,7 +662,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2757
   :init-specs
   ((:texture (lightning2 effects))
@@ -721,7 +681,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2756
   :init-specs
   ((:texture (lightning effects))
@@ -741,7 +700,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpartgroup group-final-boss-mine-explosion
   :id 619
   :flags (use-local-clock)
@@ -770,7 +728,6 @@
    (sp-item 2499 :flags (start-dead))
    (sp-item 2505 :period (seconds 3) :length (seconds 0.067))))
 
-;; failed to figure out what this is:
 (defpart 2503
   :init-specs
   ((:texture (bigpuff effects))
@@ -795,7 +752,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 10))))
 
-;; failed to figure out what this is:
 (defpart 2499
   :init-specs
   ((:texture (bigpuff effects))
@@ -816,11 +772,9 @@
    (:next-time (seconds 0.14))
    (:next-launcher 2506)))
 
-;; failed to figure out what this is:
 (defpart 2506
   :init-specs ((:fade-r -0.14222223) (:fade-g -0.14222223) (:fade-b -0.14222223)))
 
-;; failed to figure out what this is:
 (defpart 2502
   :init-specs
   ((:texture (hotdot effects))
@@ -848,11 +802,9 @@
    (:conerot-radius (meters 2) (meters 12))
    (:rotate-y (degrees 0) (degrees 360))))
 
-;; failed to figure out what this is:
 (defpart 2507
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0) (:fade-a -0.21333334)))
 
-;; failed to figure out what this is:
 (defpart 2505
   :init-specs
   ((:texture (hotdot effects))
@@ -873,7 +825,6 @@
    (:timer (seconds 0.4))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2501
   :init-specs
   ((:texture (starflash effects))
@@ -890,7 +841,6 @@
    (:timer (seconds 0.25))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2504
   :init-specs
   ((:texture (bigpuff effects))
@@ -917,11 +867,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 20))))
 
-;; failed to figure out what this is:
 (defpart 2508
   :init-specs ((:fade-r -1.6) (:fade-g -1.6) (:fade-b -1.0666667) (:next-time (seconds 0.2)) (:next-launcher 2509)))
 
-;; failed to figure out what this is:
 (defpart 2509
   :init-specs
   ((:fade-r -0.26666668)
@@ -931,11 +879,9 @@
    (:next-time (seconds 0.6))
    (:next-launcher 2510)))
 
-;; failed to figure out what this is:
 (defpart 2510
   :init-specs ((:fade-r -0.114285715) (:fade-g -0.114285715) (:fade-b 0.0)))
 
-;; failed to figure out what this is:
 (defpart 2500
   :init-specs
   ((:texture (water-ring effects))
@@ -955,11 +901,9 @@
    (:next-time (seconds 0.2))
    (:next-launcher 2511)))
 
-;; failed to figure out what this is:
 (defpart 2511
   :init-specs ((:fade-a -1.4222223)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-greenshot-launch
   :id 640
   :flags (use-local-clock)
@@ -970,7 +914,6 @@
    (sp-item 2801 :period (seconds 2) :length (seconds 0.067))
    (sp-item 2802 :period (seconds 2) :length (seconds 0.035))))
 
-;; failed to figure out what this is:
 (defpart 2800
   :init-specs
   ((:texture (flare effects))
@@ -992,11 +935,9 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2803)))
 
-;; failed to figure out what this is:
 (defpart 2803
   :init-specs ((:fade-a -1.6)))
 
-;; failed to figure out what this is:
 (defpart 2801
   :init-specs
   ((:texture (flare effects))
@@ -1017,7 +958,6 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2803)))
 
-;; failed to figure out what this is:
 (defpart 2802
   :init-specs
   ((:texture (starflash effects))
@@ -1036,7 +976,6 @@
    (:next-time (seconds 0.135))
    (:next-launcher 2804)))
 
-;; failed to figure out what this is:
 (defpart 2799
   :init-specs
   ((:texture (starflash effects))
@@ -1055,7 +994,6 @@
    (:timer (seconds 0.35))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-greenshot
   :id 664
   :duration (seconds 3)
@@ -1112,7 +1050,6 @@
    (sp-item 2768 :flags (start-dead launch-asap))
    (sp-item 2768 :flags (start-dead launch-asap))))
 
-;; failed to figure out what this is:
 (defpart 2769
   :init-specs
   ((:texture (hotdot effects))
@@ -1126,7 +1063,6 @@
    (:flags (die-when-faded glow no-fog))
    (:func 'sparticle-track-root)))
 
-;; failed to figure out what this is:
 (defpart 2766
   :init-specs
   ((:texture (hotdot effects))
@@ -1149,7 +1085,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 2770)))
 
-;; failed to figure out what this is:
 (defpart 2770
   :init-specs
   ((:scale-x (meters 3) (meters 2))
@@ -1161,7 +1096,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 2770)))
 
-;; failed to figure out what this is:
 (defpart 2767
   :init-specs
   ((:texture (hotdot effects))
@@ -1186,11 +1120,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0.1))))
 
-;; failed to figure out what this is:
 (defpart 2771
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0)))
 
-;; failed to figure out what this is:
 (defpart 2768
   :init-specs
   ((:texture (hotdot effects))
@@ -1218,14 +1150,12 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 1) (meters 1))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot-charge
   :id 646
   :duration (seconds 3)
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2699) (sp-item 2700) (sp-item 2701)))
 
-;; failed to figure out what this is:
 (defpart 2699
   :init-specs
   ((:texture (flare effects))
@@ -1247,11 +1177,9 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2703)))
 
-;; failed to figure out what this is:
 (defpart 2703
   :init-specs ((:fade-a -1.4222221)))
 
-;; failed to figure out what this is:
 (defpart 2700
   :init-specs
   ((:texture (flare effects))
@@ -1272,7 +1200,6 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2703)))
 
-;; failed to figure out what this is:
 (defpart 2701
   :init-specs
   ((:texture (starflash effects))
@@ -1290,7 +1217,6 @@
    (:timer (seconds 0.05))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot-launch
   :id 641
   :flags (use-local-clock)
@@ -1301,7 +1227,6 @@
    (sp-item 2807 :period (seconds 2) :length (seconds 0.067))
    (sp-item 2808 :period (seconds 2) :length (seconds 0.035))))
 
-;; failed to figure out what this is:
 (defpart 2806
   :init-specs
   ((:texture (flare effects))
@@ -1323,11 +1248,9 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2809)))
 
-;; failed to figure out what this is:
 (defpart 2809
   :init-specs ((:fade-a -1.6)))
 
-;; failed to figure out what this is:
 (defpart 2807
   :init-specs
   ((:texture (flare effects))
@@ -1348,7 +1271,6 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2809)))
 
-;; failed to figure out what this is:
 (defpart 2808
   :init-specs
   ((:texture (starflash effects))
@@ -1367,7 +1289,6 @@
    (:next-time (seconds 0.135))
    (:next-launcher 2810)))
 
-;; failed to figure out what this is:
 (defpart 2805
   :init-specs
   ((:texture (starflash effects))
@@ -1386,7 +1307,6 @@
    (:timer (seconds 0.35))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot-body
   :id 665
   :duration (seconds 3)
@@ -1394,7 +1314,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2709) (sp-item 2710) (sp-item 2711)))
 
-;; failed to figure out what this is:
 (defpart 2710
   :init-specs
   ((:texture (harddot effects))
@@ -1410,7 +1329,6 @@
    (:timer (seconds 0.017))
    (:flags (die-when-faded))))
 
-;; failed to figure out what this is:
 (defpart 2711
   :init-specs
   ((:texture (hotdot effects))
@@ -1426,7 +1344,6 @@
    (:timer (seconds 0.017))
    (:flags (die-when-faded))))
 
-;; failed to figure out what this is:
 (defpart 2709
   :init-specs
   ((:texture (harddot effects))
@@ -1449,7 +1366,6 @@
    (:conerot-y (degrees 0) (degrees 1440))
    (:conerot-radius (meters 1))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot-warning
   :id 647
   :duration (seconds 3)
@@ -1457,7 +1373,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2712) (sp-item 2713) (sp-item 2714 :period (seconds 0.15) :length (seconds 0.017))))
 
-;; failed to figure out what this is:
 (defpart 2714
   :init-specs
   ((:texture (starflash effects))
@@ -1479,7 +1394,6 @@
    (:flags (die-when-faded glow no-fog))
    (:next-time (seconds 0.25))))
 
-;; failed to figure out what this is:
 (defpart 2712
   :init-specs
   ((:texture (hotdot effects))
@@ -1501,7 +1415,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2713
   :init-specs
   ((:texture (harddot effects))
@@ -1525,14 +1438,12 @@
    (:conerot-y (degrees 0) (degrees 1440))
    (:conerot-radius (meters 1))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot
   :id 648
   :flags (use-local-clock)
   :bounds (static-bspherem 0 0 0 8)
   :parts ((sp-item 2626 :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 2626
   :init-specs
   ((:texture (water-ring effects))
@@ -1548,7 +1459,6 @@
    (:timer (seconds 0.035))
    (:flags (die-when-faded glow))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-redshot-test
   :id 679
   :duration (seconds 3)
@@ -1556,7 +1466,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2772)))
 
-;; failed to figure out what this is:
 (defpart 2772
   :init-specs
   ((:texture (hotdot effects))
@@ -1574,7 +1483,6 @@
    (:timer (seconds 0.135))
    (:flags (die-when-faded glow))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-red-blowup
   :id 649
   :flags (use-local-clock)
@@ -1585,7 +1493,6 @@
    (sp-item 2631 :period (seconds 2) :length (seconds 0.135))
    (sp-item 2632 :period (seconds 2) :length (seconds 0.135))))
 
-;; failed to figure out what this is:
 (defpart 2630
   :init-specs
   ((:texture (hotdot effects))
@@ -1613,11 +1520,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpart 2633
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0) (:fade-a -1.0666667)))
 
-;; failed to figure out what this is:
 (defpart 2632
   :init-specs
   ((:texture (hotdot effects))
@@ -1638,7 +1543,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2629
   :init-specs
   ((:texture (starflash effects))
@@ -1654,7 +1558,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2631
   :init-specs
   ((:texture (bigpuff effects))
@@ -1681,11 +1584,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 6))))
 
-;; failed to figure out what this is:
 (defpart 2634
   :init-specs ((:fade-r 0.0) (:fade-g -1.0666667) (:fade-b -2.1333334) (:next-time (seconds 0.2)) (:next-launcher 2635)))
 
-;; failed to figure out what this is:
 (defpart 2635
   :init-specs
   ((:fade-r 0.0)
@@ -1695,11 +1596,9 @@
    (:next-time (seconds 0.5))
    (:next-launcher 2636)))
 
-;; failed to figure out what this is:
 (defpart 2636
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-red-smoke
   :id 650
   :flags (use-local-clock)
@@ -1711,7 +1610,6 @@
    (sp-item 2637 :period (seconds 0.05) :length (seconds 0.017))
    (sp-item 2777)))
 
-;; failed to figure out what this is:
 (defpart 2777
   :init-specs
   ((:texture (starflash effects))
@@ -1727,7 +1625,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2637
   :init-specs
   ((:texture (bigpuff effects))
@@ -1750,7 +1647,6 @@
    (:next-time (seconds 0.067) (seconds 0.297))
    (:next-launcher 2596)))
 
-;; failed to figure out what this is:
 (defpart 2776
   :init-specs
   ((:texture (hotdot effects))
@@ -1778,7 +1674,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellowshot-launch
   :id 642
   :flags (use-local-clock)
@@ -1789,7 +1684,6 @@
    (sp-item 2780 :period (seconds 2) :length (seconds 0.067))
    (sp-item 2781 :period (seconds 2) :length (seconds 0.035))))
 
-;; failed to figure out what this is:
 (defpart 2779
   :init-specs
   ((:texture (flare effects))
@@ -1811,11 +1705,9 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2782)))
 
-;; failed to figure out what this is:
 (defpart 2782
   :init-specs ((:fade-a -1.6)))
 
-;; failed to figure out what this is:
 (defpart 2780
   :init-specs
   ((:texture (flare effects))
@@ -1836,7 +1728,6 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2782)))
 
-;; failed to figure out what this is:
 (defpart 2781
   :init-specs
   ((:texture (starflash effects))
@@ -1855,7 +1746,6 @@
    (:next-time (seconds 0.135))
    (:next-launcher 2783)))
 
-;; failed to figure out what this is:
 (defpart 2778
   :init-specs
   ((:texture (starflash effects))
@@ -1874,7 +1764,6 @@
    (:timer (seconds 0.35))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellowshot-charge
   :id 651
   :duration (seconds 3)
@@ -1882,7 +1771,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2811) (sp-item 2812) (sp-item 2813)))
 
-;; failed to figure out what this is:
 (defpart 2811
   :init-specs
   ((:texture (flare effects))
@@ -1904,11 +1792,9 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2814)))
 
-;; failed to figure out what this is:
 (defpart 2814
   :init-specs ((:fade-a -1.4222221)))
 
-;; failed to figure out what this is:
 (defpart 2812
   :init-specs
   ((:texture (flare effects))
@@ -1929,7 +1815,6 @@
    (:next-time (seconds 0.017) (seconds 0.065))
    (:next-launcher 2814)))
 
-;; failed to figure out what this is:
 (defpart 2813
   :init-specs
   ((:texture (starflash effects))
@@ -1947,7 +1832,6 @@
    (:timer (seconds 0.05))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellowshot
   :id 652
   :duration (seconds 3)
@@ -1955,7 +1839,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2815) (sp-item 2816) (sp-item 2817) (sp-item 2818) (sp-item 2819)))
 
-;; failed to figure out what this is:
 (defpart 2816
   :init-specs
   ((:texture (harddot effects))
@@ -1977,7 +1860,6 @@
    (:conerot-y (degrees 0) (degrees 1440))
    (:conerot-radius (meters 2))))
 
-;; failed to figure out what this is:
 (defpart 2819
   :init-specs
   ((:texture (hotdot effects))
@@ -1998,7 +1880,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2815
   :init-specs
   ((:texture (harddot effects))
@@ -2023,7 +1904,6 @@
    (:conerot-y (degrees 0) (degrees 1440))
    (:conerot-radius (meters 1))))
 
-;; failed to figure out what this is:
 (defpart 2817
   :init-specs
   ((:texture (harddot effects))
@@ -2042,7 +1922,6 @@
    (:timer (seconds 0.25))
    (:flags (die-when-faded))))
 
-;; failed to figure out what this is:
 (defpart 2818
   :init-specs
   ((:texture (hotdot effects))
@@ -2057,7 +1936,6 @@
    (:timer (seconds 0.017))
    (:flags (die-when-faded))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellow-blowup
   :id 653
   :flags (use-local-clock)
@@ -2068,7 +1946,6 @@
    (sp-item 2650 :period (seconds 2) :length (seconds 0.135))
    (sp-item 2651 :period (seconds 2) :length (seconds 0.135))))
 
-;; failed to figure out what this is:
 (defpart 2649
   :init-specs
   ((:texture (hotdot effects))
@@ -2096,11 +1973,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpart 2652
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0) (:fade-a -1.0666667)))
 
-;; failed to figure out what this is:
 (defpart 2651
   :init-specs
   ((:texture (hotdot effects))
@@ -2121,7 +1996,6 @@
    (:timer (seconds 0.2))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2648
   :init-specs
   ((:texture (starflash effects))
@@ -2137,7 +2011,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2650
   :init-specs
   ((:texture (bigpuff effects))
@@ -2164,11 +2037,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 0) (meters 12))))
 
-;; failed to figure out what this is:
 (defpart 2653
   :init-specs ((:fade-r 0.0) (:fade-g -1.0666667) (:fade-b -2.1333334) (:next-time (seconds 0.2)) (:next-launcher 2654)))
 
-;; failed to figure out what this is:
 (defpart 2654
   :init-specs
   ((:fade-r -0.28444445)
@@ -2178,11 +2049,9 @@
    (:next-time (seconds 0.5))
    (:next-launcher 2655)))
 
-;; failed to figure out what this is:
 (defpart 2655
   :init-specs ((:fade-r 0.0) (:fade-g 0.0) (:fade-b 0.0)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellow-smoke
   :id 654
   :flags (use-local-clock)
@@ -2194,7 +2063,6 @@
    (sp-item 2656 :period (seconds 0.05) :length (seconds 0.017))
    (sp-item 2821)))
 
-;; failed to figure out what this is:
 (defpart 2821
   :init-specs
   ((:texture (starflash effects))
@@ -2210,7 +2078,6 @@
    (:timer (seconds 0.18))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2656
   :init-specs
   ((:texture (bigpuff effects))
@@ -2233,7 +2100,6 @@
    (:next-time (seconds 0.067) (seconds 0.297))
    (:next-launcher 2596)))
 
-;; failed to figure out what this is:
 (defpart 2820
   :init-specs
   ((:texture (hotdot effects))
@@ -2261,13 +2127,11 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 2) (meters 4))))
 
-;; failed to figure out what this is:
 (defpartgroup group-white-eco
   :id 655
   :bounds (static-bspherem 0 0.5 0 1.5)
   :parts ((sp-item 2852)))
 
-;; failed to figure out what this is:
 (defpart 2852
   :init-specs
   ((:num 1.0)
@@ -2282,7 +2146,6 @@
    (:conerot-y (degrees -1440) (degrees 2880))
    (:rotate-y (degrees 6.0000005))))
 
-;; failed to figure out what this is:
 (defpart 2657
   :init-specs
   ((:texture (flare effects))
@@ -2305,11 +2168,9 @@
    (:next-time (seconds 0.3))
    (:next-launcher 2661)))
 
-;; failed to figure out what this is:
 (defpart 2661
   :init-specs ((:fade-a -0.53333336)))
 
-;; failed to figure out what this is:
 (defpart 2658
   :init-specs
   ((:texture (flare effects))
@@ -2331,7 +2192,6 @@
    (:next-time (seconds 0.25))
    (:next-launcher 2661)))
 
-;; failed to figure out what this is:
 (defpart 2659
   :init-specs
   ((:texture (starflash effects))
@@ -2348,7 +2208,6 @@
    (:flags (die-when-faded glow no-fog))
    (:func 'sparticle-track-root)))
 
-;; failed to figure out what this is:
 (defpart 2660
   :init-specs
   ((:texture (starflash effects))
@@ -2365,7 +2224,6 @@
    (:flags (die-when-faded glow no-fog))
    (:func 'sparticle-track-root)))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-blue-claw-beam
   :id 666
   :flags (use-local-clock)
@@ -2386,14 +2244,12 @@
    (sp-item 2721)
    (sp-item 2722)))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-blue-claw-beam-impact
   :id 667
   :flags (use-local-clock)
   :bounds (static-bspherem 0 0 0 10)
   :parts ((sp-item 2723 :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 2723
   :init-specs
   ((:texture (starflash effects))
@@ -2411,7 +2267,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2719
   :init-specs
   ((:texture (hotdot effects))
@@ -2431,7 +2286,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2716
   :init-specs
   ((:texture (hotdot effects))
@@ -2453,7 +2307,6 @@
    (:timer (seconds 6))
    (:flags (die-when-faded glow orbit no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2717
   :init-specs
   ((:texture (lightning effects))
@@ -2472,7 +2325,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2718
   :init-specs
   ((:texture (lightning effects))
@@ -2491,7 +2343,6 @@
    (:next-time (seconds 0.035))
    (:next-launcher 146)))
 
-;; failed to figure out what this is:
 (defpart 2720
   :init-specs
   ((:texture (hotdot effects))
@@ -2511,7 +2362,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2722
   :init-specs
   ((:texture (hotdot effects))
@@ -2531,7 +2381,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2721
   :init-specs
   ((:texture (starflash effects))
@@ -2547,7 +2396,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-red-claw-beam
   :id 668
   :flags (use-local-clock)
@@ -2567,7 +2415,6 @@
    (sp-item 2728)
    (sp-item 2729)))
 
-;; failed to figure out what this is:
 (defpart 2730
   :init-specs
   ((:texture (starflash effects))
@@ -2585,7 +2432,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2726
   :init-specs
   ((:texture (hotdot effects))
@@ -2604,7 +2450,6 @@
    (:conerot-x (degrees 100.00001))
    (:conerot-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 2724
   :init-specs
   ((:texture (hotdot effects))
@@ -2626,7 +2471,6 @@
    (:timer (seconds 1.5))
    (:flags (die-when-faded glow orbit no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2725
   :init-specs
   ((:texture (bigpuff effects))
@@ -2650,7 +2494,6 @@
    (:next-time (seconds 0.8))
    (:next-launcher 171)))
 
-;; failed to figure out what this is:
 (defpart 2727
   :init-specs
   ((:texture (hotdot effects))
@@ -2670,7 +2513,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2729
   :init-specs
   ((:texture (hotdot effects))
@@ -2689,7 +2531,6 @@
    (:conerot-x (degrees 100.00001))
    (:conerot-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 2728
   :init-specs
   ((:texture (starflash effects))
@@ -2705,7 +2546,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-yellow-claw-beam
   :id 670
   :flags (use-local-clock)
@@ -2727,14 +2567,12 @@
    (sp-item 2735)
    (sp-item 2736)))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-yellow-claw-beam-impact
   :id 671
   :flags (use-local-clock)
   :bounds (static-bspherem 0 0 0 10)
   :parts ((sp-item 2737 :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 2737
   :init-specs
   ((:texture (starflash effects))
@@ -2752,7 +2590,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2733
   :init-specs
   ((:texture (hotdot effects))
@@ -2772,7 +2609,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2731
   :init-specs
   ((:texture (hotdot effects))
@@ -2794,7 +2630,6 @@
    (:timer (seconds 2))
    (:flags (die-when-faded glow orbit no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2732
   :init-specs
   ((:texture (hotdot effects))
@@ -2813,7 +2648,6 @@
    (:timer (seconds 0.1) (seconds 0.997))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2734
   :init-specs
   ((:texture (hotdot effects))
@@ -2833,7 +2667,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2736
   :init-specs
   ((:texture (hotdot effects))
@@ -2853,7 +2686,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2735
   :init-specs
   ((:texture (starflash effects))
@@ -2869,7 +2701,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-green-claw-beam
   :id 672
   :flags (use-local-clock)
@@ -2891,14 +2722,12 @@
    (sp-item 2742)
    (sp-item 2743)))
 
-;; failed to figure out what this is:
 (defpartgroup group-finalboss-green-claw-beam-impact
   :id 673
   :flags (use-local-clock)
   :bounds (static-bspherem 0 0 0 10)
   :parts ((sp-item 2744 :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 2744
   :init-specs
   ((:texture (starflash effects))
@@ -2916,7 +2745,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2740
   :init-specs
   ((:texture (hotdot effects))
@@ -2936,7 +2764,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2738
   :init-specs
   ((:texture (hotdot effects))
@@ -2958,7 +2785,6 @@
    (:timer (seconds 2))
    (:flags (die-when-faded orbit no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2739
   :init-specs
   ((:texture (hotdot effects))
@@ -2976,7 +2802,6 @@
    (:timer (seconds 0.1) (seconds 0.997))
    (:flags (die-when-faded no-fog))))
 
-;; failed to figure out what this is:
 (defpart 2741
   :init-specs
   ((:texture (hotdot effects))
@@ -2996,7 +2821,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2743
   :init-specs
   ((:texture (hotdot effects))
@@ -3016,7 +2840,6 @@
    (:conerot-y (degrees -90))
    (:conerot-radius (meters 0) (meters 0.5))))
 
-;; failed to figure out what this is:
 (defpart 2742
   :init-specs
   ((:texture (starflash effects))
@@ -3032,7 +2855,6 @@
    (:timer (seconds 0.067))
    (:flags (die-when-faded glow no-fog))))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-blue-claw-glow
   :id 674
   :duration (seconds 3)
@@ -3040,7 +2862,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2324)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-green-claw-glow
   :id 675
   :duration (seconds 3)
@@ -3048,7 +2869,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2324)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-red-claw-glow
   :id 676
   :duration (seconds 3)
@@ -3056,7 +2876,6 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2324)))
 
-;; failed to figure out what this is:
 (defpartgroup group-robotboss-yellow-claw-glow
   :id 677
   :duration (seconds 3)
@@ -3064,5 +2883,4 @@
   :bounds (static-bspherem 0 0 0 64)
   :parts ((sp-item 2324)))
 
-;; failed to figure out what this is:
 0
diff --git a/goal_src/jak1/levels/sunken/sunken-part2.gc b/goal_src/jak1/levels/sunken/sunken-part2.gc
index 9ed9697d45..d66f683677 100644
--- a/goal_src/jak1/levels/sunken/sunken-part2.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part2.gc
@@ -6,7 +6,6 @@
 (require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; DECOMP BEGINS
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-34
   :id 353
   :bounds (static-bspherem 0 4 0 32)
@@ -70,7 +69,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1496 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1496
   :init-specs
   ((:texture (lakedrop effects))
@@ -92,7 +90,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 7.0000005) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1495
   :init-specs
   ((:texture (lakedrop effects))
@@ -109,7 +106,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 7.0000005) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-36
   :id 354
   :bounds (static-bspherem 0 4 0 32)
@@ -173,7 +169,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1498 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1498
   :init-specs
   ((:texture (lakedrop effects))
@@ -195,7 +190,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1497
   :init-specs
   ((:texture (lakedrop effects))
@@ -212,7 +206,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-30
   :id 355
   :bounds (static-bspherem 0 4 0 30)
@@ -276,7 +269,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1500 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1500
   :init-specs
   ((:texture (lakedrop effects))
@@ -298,7 +290,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -20) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1499
   :init-specs
   ((:texture (lakedrop effects))
@@ -315,7 +306,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -20) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-31
   :id 356
   :bounds (static-bspherem 0 4 0 32)
@@ -379,7 +369,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1502 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1502
   :init-specs
   ((:texture (lakedrop effects))
@@ -401,7 +390,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -120) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1501
   :init-specs
   ((:texture (lakedrop effects))
@@ -418,7 +406,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -120) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-29
   :id 357
   :bounds (static-bspherem 0 4 0 32)
@@ -482,7 +469,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1504 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1504
   :init-specs
   ((:texture (lakedrop effects))
@@ -504,7 +490,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1503
   :init-specs
   ((:texture (lakedrop effects))
@@ -521,7 +506,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-159
   :id 358
   :bounds (static-bspherem 0 4 0 32)
@@ -585,7 +569,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1506 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1506
   :init-specs
   ((:texture (lakedrop effects))
@@ -607,7 +590,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 60) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1505
   :init-specs
   ((:texture (lakedrop effects))
@@ -624,7 +606,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 60) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-161
   :id 359
   :bounds (static-bspherem 0 4 0 32)
@@ -688,7 +669,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1508 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1508
   :init-specs
   ((:texture (lakedrop effects))
@@ -710,7 +690,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 70) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1507
   :init-specs
   ((:texture (lakedrop effects))
@@ -727,7 +706,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 70) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-204
   :id 360
   :bounds (static-bspherem 0 4 0 32)
@@ -791,7 +769,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1510 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1510
   :init-specs
   ((:texture (lakedrop effects))
@@ -813,7 +790,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 30) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1509
   :init-specs
   ((:texture (lakedrop effects))
@@ -830,7 +806,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 30) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-205
   :id 361
   :bounds (static-bspherem 0 4 0 32)
@@ -894,7 +869,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1512 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1512
   :init-specs
   ((:texture (lakedrop effects))
@@ -916,7 +890,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 130) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1511
   :init-specs
   ((:texture (lakedrop effects))
@@ -933,7 +906,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 130) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-203
   :id 362
   :bounds (static-bspherem 0 4 0 32)
@@ -997,7 +969,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1514 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1514
   :init-specs
   ((:texture (lakedrop effects))
@@ -1019,7 +990,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 80) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1513
   :init-specs
   ((:texture (lakedrop effects))
@@ -1036,7 +1006,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 80) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-42
   :id 363
   :bounds (static-bspherem 0 4 0 32)
@@ -1100,7 +1069,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1516 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1516
   :init-specs
   ((:texture (lakedrop effects))
@@ -1122,7 +1090,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 195))))
 
-;; failed to figure out what this is:
 (defpart 1515
   :init-specs
   ((:texture (lakedrop effects))
@@ -1139,7 +1106,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 195))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-41
   :id 364
   :bounds (static-bspherem 0 4 0 32)
@@ -1203,7 +1169,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1518 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1518
   :init-specs
   ((:texture (lakedrop effects))
@@ -1225,7 +1190,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -70) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1517
   :init-specs
   ((:texture (lakedrop effects))
@@ -1242,7 +1206,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -70) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-206
   :id 365
   :bounds (static-bspherem 0 4 0 32)
@@ -1306,7 +1269,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1520 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1520
   :init-specs
   ((:texture (lakedrop effects))
@@ -1328,7 +1290,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 170) (degrees 30))))
 
-;; failed to figure out what this is:
 (defpart 1519
   :init-specs
   ((:texture (lakedrop effects))
@@ -1345,7 +1306,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 170) (degrees 30))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-201
   :id 366
   :bounds (static-bspherem 0 4 0 32)
@@ -1409,7 +1369,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1522 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1522
   :init-specs
   ((:texture (lakedrop effects))
@@ -1431,7 +1390,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -40) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1521
   :init-specs
   ((:texture (lakedrop effects))
@@ -1448,7 +1406,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -40) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-3
   :id 367
   :bounds (static-bspherem 0 4 0 32)
@@ -1512,7 +1469,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1524 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1524
   :init-specs
   ((:texture (lakedrop effects))
@@ -1534,7 +1490,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1523
   :init-specs
   ((:texture (lakedrop effects))
@@ -1551,7 +1506,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 160) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-2
   :id 368
   :bounds (static-bspherem 0 4 0 32)
@@ -1615,7 +1569,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1526 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1526
   :init-specs
   ((:texture (lakedrop effects))
@@ -1637,7 +1590,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 249.99998) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1525
   :init-specs
   ((:texture (lakedrop effects))
@@ -1654,7 +1606,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 249.99998) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-382
   :id 369
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1687,7 +1638,6 @@
    (sp-item 1527 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1529 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1528
   :init-specs
   ((:texture (harddot effects))
@@ -1705,7 +1655,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1527
   :init-specs
   ((:texture (hotdot effects))
@@ -1728,7 +1677,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1529
   :init-specs
   ((:num 0.2)
@@ -1748,7 +1696,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-381
   :id 370
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1781,7 +1728,6 @@
    (sp-item 1530 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1532 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1531
   :init-specs
   ((:texture (harddot effects))
@@ -1799,7 +1745,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 80))))
 
-;; failed to figure out what this is:
 (defpart 1530
   :init-specs
   ((:texture (hotdot effects))
@@ -1822,7 +1767,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1532
   :init-specs
   ((:num 0.2)
@@ -1842,7 +1786,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 80))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-380
   :id 371
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1875,7 +1818,6 @@
    (sp-item 1533 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1535 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1534
   :init-specs
   ((:texture (harddot effects))
@@ -1893,7 +1835,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 47.5))))
 
-;; failed to figure out what this is:
 (defpart 1533
   :init-specs
   ((:texture (hotdot effects))
@@ -1916,7 +1857,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1535
   :init-specs
   ((:num 0.2)
@@ -1936,7 +1876,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 47.5))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-379
   :id 372
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1969,7 +1908,6 @@
    (sp-item 1536 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1538 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1537
   :init-specs
   ((:texture (harddot effects))
@@ -1987,7 +1925,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 70))))
 
-;; failed to figure out what this is:
 (defpart 1536
   :init-specs
   ((:texture (hotdot effects))
@@ -2010,7 +1947,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1538
   :init-specs
   ((:num 0.2)
@@ -2030,7 +1966,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 70))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-378
   :id 373
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2063,7 +1998,6 @@
    (sp-item 1539 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1541 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1540
   :init-specs
   ((:texture (harddot effects))
@@ -2081,7 +2015,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 23.000002))))
 
-;; failed to figure out what this is:
 (defpart 1539
   :init-specs
   ((:texture (hotdot effects))
@@ -2104,7 +2037,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1541
   :init-specs
   ((:num 0.2)
@@ -2124,7 +2056,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 23.000002))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-402
   :id 374
   :bounds (static-bspherem 0 4 0 32)
@@ -2188,7 +2119,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1543 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1543
   :init-specs
   ((:texture (lakedrop effects))
@@ -2210,7 +2140,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 190) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1542
   :init-specs
   ((:texture (lakedrop effects))
@@ -2227,7 +2156,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 190) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-401
   :id 375
   :bounds (static-bspherem 0 4 0 32)
@@ -2291,7 +2219,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1545 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1545
   :init-specs
   ((:texture (lakedrop effects))
@@ -2313,7 +2240,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 105) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1544
   :init-specs
   ((:texture (lakedrop effects))
@@ -2330,7 +2256,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 105) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-400
   :id 376
   :bounds (static-bspherem 0 4 0 32)
@@ -2394,7 +2319,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1547 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1547
   :init-specs
   ((:texture (lakedrop effects))
@@ -2416,7 +2340,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 20) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1546
   :init-specs
   ((:texture (lakedrop effects))
@@ -2433,7 +2356,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 20) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-399
   :id 377
   :bounds (static-bspherem 0 4 0 32)
@@ -2497,7 +2419,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1549 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1549
   :init-specs
   ((:texture (lakedrop effects))
@@ -2519,7 +2440,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 225) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1548
   :init-specs
   ((:texture (lakedrop effects))
diff --git a/goal_src/jak1/levels/sunken/sunken-part3.gc b/goal_src/jak1/levels/sunken/sunken-part3.gc
index c04ebefd25..270f8ebcea 100644
--- a/goal_src/jak1/levels/sunken/sunken-part3.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part3.gc
@@ -7,7 +7,6 @@
 
 ;; DECOMP BEGINS
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-383
   :id 378
   :bounds (static-bspherem 0 1 0 3)
@@ -40,7 +39,6 @@
    (sp-item 1550 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1552 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1551
   :init-specs
   ((:texture (harddot effects))
@@ -58,7 +56,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1550
   :init-specs
   ((:texture (hotdot effects))
@@ -81,7 +78,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1552
   :init-specs
   ((:num 0.2)
@@ -101,7 +97,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-198
   :id 379
   :bounds (static-bspherem 0 1 0 3.5)
@@ -134,7 +129,6 @@
    (sp-item 1553 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1555 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1554
   :init-specs
   ((:texture (harddot effects))
@@ -152,7 +146,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 120))))
 
-;; failed to figure out what this is:
 (defpart 1553
   :init-specs
   ((:texture (hotdot effects))
@@ -175,7 +168,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1555
   :init-specs
   ((:num 0.2)
@@ -195,7 +187,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 120))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-189
   :id 380
   :bounds (static-bspherem 0 1 0 3.5)
@@ -228,7 +219,6 @@
    (sp-item 1556 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1558 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1557
   :init-specs
   ((:texture (harddot effects))
@@ -246,7 +236,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 116))))
 
-;; failed to figure out what this is:
 (defpart 1556
   :init-specs
   ((:texture (hotdot effects))
@@ -269,7 +258,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1558
   :init-specs
   ((:num 0.05)
@@ -289,7 +277,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 116))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-193
   :id 381
   :bounds (static-bspherem 0 1 0 3.5)
@@ -323,7 +310,6 @@
    (sp-item 1561 :fade-after (meters 64) :falloff-to (meters 64))
    (sp-item 1562 :fade-after (meters 60) :falloff-to (meters 60))))
 
-;; failed to figure out what this is:
 (defpart 1560
   :init-specs
   ((:texture (harddot effects))
@@ -341,7 +327,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 116))))
 
-;; failed to figure out what this is:
 (defpart 1559
   :init-specs
   ((:texture (hotdot effects))
@@ -364,7 +349,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1561
   :init-specs
   ((:num 1.0)
@@ -381,7 +365,6 @@
    (:conerot-x (degrees 90))
    (:conerot-y (degrees 90) (degrees 360))))
 
-;; failed to figure out what this is:
 (defpart 1562
   :init-specs
   ((:texture (lakedrop effects))
@@ -403,7 +386,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 1))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-207
   :id 382
   :bounds (static-bspherem 0 1 0 3.5)
@@ -436,7 +418,6 @@
    (sp-item 1563 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1565 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1564
   :init-specs
   ((:texture (harddot effects))
@@ -454,7 +435,6 @@
    (:conerot-radius (meters 0) 4 (meters 0.7))
    (:rotate-y (degrees 25.000002))))
 
-;; failed to figure out what this is:
 (defpart 1563
   :init-specs
   ((:texture (hotdot effects))
@@ -477,7 +457,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1565
   :init-specs
   ((:num 0.2)
@@ -497,7 +476,6 @@
    (:conerot-radius (meters 0) (meters 2.8))
    (:rotate-y (degrees 25.000002))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-388
   :id 383
   :bounds (static-bspherem 0 4 0 32)
@@ -561,7 +539,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1567 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1567
   :init-specs
   ((:texture (lakedrop effects))
@@ -583,7 +560,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 10) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1566
   :init-specs
   ((:texture (lakedrop effects))
@@ -600,7 +576,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 10) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-387
   :id 384
   :bounds (static-bspherem 0 4 0 32)
@@ -664,7 +639,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1569 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1569
   :init-specs
   ((:texture (lakedrop effects))
@@ -686,7 +660,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 40) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1568
   :init-specs
   ((:texture (lakedrop effects))
@@ -703,7 +676,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 40) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-386
   :id 385
   :bounds (static-bspherem 0 4 0 32)
@@ -767,7 +739,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1571 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1571
   :init-specs
   ((:texture (lakedrop effects))
@@ -789,7 +760,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 130) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1570
   :init-specs
   ((:texture (lakedrop effects))
@@ -806,7 +776,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 130) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-384
   :id 386
   :bounds (static-bspherem 0 4 0 32)
@@ -870,7 +839,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1573 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1573
   :init-specs
   ((:texture (lakedrop effects))
@@ -892,7 +860,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -204.99998) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1572
   :init-specs
   ((:texture (lakedrop effects))
@@ -909,7 +876,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -204.99998) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-385
   :id 387
   :bounds (static-bspherem 0 4 0 32)
@@ -973,7 +939,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1575 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1575
   :init-specs
   ((:texture (lakedrop effects))
@@ -995,7 +960,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -185) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1574
   :init-specs
   ((:texture (lakedrop effects))
@@ -1012,7 +976,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -185) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-394
   :id 388
   :bounds (static-bspherem 0 4 0 32)
@@ -1076,7 +1039,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1577 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1577
   :init-specs
   ((:texture (lakedrop effects))
@@ -1098,7 +1060,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -60) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1576
   :init-specs
   ((:texture (lakedrop effects))
@@ -1115,7 +1076,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -60) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-390
   :id 389
   :bounds (static-bspherem 0 4 0 32)
@@ -1179,7 +1139,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1579 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1579
   :init-specs
   ((:texture (lakedrop effects))
@@ -1201,7 +1160,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -45) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1578
   :init-specs
   ((:texture (lakedrop effects))
@@ -1218,7 +1176,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees -45) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-393
   :id 390
   :bounds (static-bspherem 0 4 0 32)
@@ -1282,7 +1239,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1583 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1583
   :init-specs
   ((:texture (lakedrop effects))
@@ -1304,7 +1260,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 90) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1582
   :init-specs
   ((:texture (lakedrop effects))
@@ -1321,7 +1276,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 90) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-392
   :id 391
   :bounds (static-bspherem 0 4 0 32)
@@ -1385,7 +1339,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1585 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1585
   :init-specs
   ((:texture (lakedrop effects))
@@ -1407,7 +1360,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 135) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1584
   :init-specs
   ((:texture (lakedrop effects))
@@ -1424,7 +1376,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 135) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-38
   :id 392
   :bounds (static-bspherem 0 4 0 32)
@@ -1488,7 +1439,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1587 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1587
   :init-specs
   ((:texture (lakedrop effects))
@@ -1510,7 +1460,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 145) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1586
   :init-specs
   ((:texture (lakedrop effects))
@@ -1527,7 +1476,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 145) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-200
   :id 393
   :bounds (static-bspherem 0 4 0 32)
@@ -1591,7 +1539,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1589 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1589
   :init-specs
   ((:texture (lakedrop effects))
@@ -1613,7 +1560,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees 45) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1588
   :init-specs
   ((:texture (lakedrop effects))
@@ -1630,7 +1576,6 @@
    (:flags (die-when-faded glow))
    (:rotate-y (degrees 45) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-window-bubbles-391
   :id 394
   :bounds (static-bspherem 0 4 0 32)
@@ -1694,7 +1639,6 @@
    (sp-item 1424 :fade-after (meters 100) :falloff-to (meters 100) :flags (auto-rearm start-dead))
    (sp-item 1581 :fade-after (meters 100) :falloff-to (meters 100))))
 
-;; failed to figure out what this is:
 (defpart 1581
   :init-specs
   ((:texture (lakedrop effects))
@@ -1716,7 +1660,6 @@
    (:next-launcher 1429)
    (:rotate-y (degrees -90) (degrees 40))))
 
-;; failed to figure out what this is:
 (defpart 1580
   :init-specs
   ((:texture (lakedrop effects))
diff --git a/goal_src/jak1/levels/sunken/sunken-part4.gc b/goal_src/jak1/levels/sunken/sunken-part4.gc
index f34697eb57..43fbef0a70 100644
--- a/goal_src/jak1/levels/sunken/sunken-part4.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part4.gc
@@ -6,7 +6,6 @@
 (require "engine/gfx/sprite/sparticle/sparticle-launcher-h.gc")
 
 ;; DECOMP BEGINS
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-282
   :id 395
   :bounds (static-bspherem 0 1 0 3.5)
@@ -39,7 +38,6 @@
    (sp-item 1590 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1592 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1591
   :init-specs
   ((:texture (harddot effects))
@@ -57,7 +55,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 112.99999))))
 
-;; failed to figure out what this is:
 (defpart 1590
   :init-specs
   ((:texture (hotdot effects))
@@ -80,7 +77,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1592
   :init-specs
   ((:num 0.2)
@@ -100,7 +96,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 112.99999))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-285
   :id 396
   :bounds (static-bspherem 0 1 0 3.5)
@@ -133,7 +128,6 @@
    (sp-item 1593 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1595 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1594
   :init-specs
   ((:texture (harddot effects))
@@ -151,7 +145,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 100.00001))))
 
-;; failed to figure out what this is:
 (defpart 1593
   :init-specs
   ((:texture (hotdot effects))
@@ -174,7 +167,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1595
   :init-specs
   ((:num 0.2)
@@ -194,7 +186,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 100.00001))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-288
   :id 397
   :bounds (static-bspherem 0 1 0 3.5)
@@ -227,7 +218,6 @@
    (sp-item 1596 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1598 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1597
   :init-specs
   ((:texture (harddot effects))
@@ -245,7 +235,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 85))))
 
-;; failed to figure out what this is:
 (defpart 1596
   :init-specs
   ((:texture (hotdot effects))
@@ -268,7 +257,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1598
   :init-specs
   ((:num 0.2)
@@ -288,7 +276,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 85))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-299
   :id 398
   :bounds (static-bspherem 0 1 0 3.5)
@@ -321,7 +308,6 @@
    (sp-item 1599 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1601 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1600
   :init-specs
   ((:texture (harddot effects))
@@ -339,7 +325,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 60))))
 
-;; failed to figure out what this is:
 (defpart 1599
   :init-specs
   ((:texture (hotdot effects))
@@ -362,7 +347,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1601
   :init-specs
   ((:num 0.2)
@@ -382,7 +366,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 60))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-302
   :id 399
   :bounds (static-bspherem 0 1 0 3.5)
@@ -415,7 +398,6 @@
    (sp-item 1602 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1604 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1603
   :init-specs
   ((:texture (harddot effects))
@@ -433,7 +415,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 47))))
 
-;; failed to figure out what this is:
 (defpart 1602
   :init-specs
   ((:texture (hotdot effects))
@@ -456,7 +437,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1604
   :init-specs
   ((:num 0.2)
@@ -476,7 +456,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 47))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-367
   :id 400
   :bounds (static-bspherem 0 1 0 3.5)
@@ -509,7 +488,6 @@
    (sp-item 1605 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1607 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1606
   :init-specs
   ((:texture (harddot effects))
@@ -527,7 +505,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 30))))
 
-;; failed to figure out what this is:
 (defpart 1605
   :init-specs
   ((:texture (hotdot effects))
@@ -550,7 +527,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1607
   :init-specs
   ((:num 0.2)
@@ -570,7 +546,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 30))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-371
   :id 401
   :bounds (static-bspherem 0 1 0 3.5)
@@ -603,7 +578,6 @@
    (sp-item 1608 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1610 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1609
   :init-specs
   ((:texture (harddot effects))
@@ -621,7 +595,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 7.0000005))))
 
-;; failed to figure out what this is:
 (defpart 1608
   :init-specs
   ((:texture (hotdot effects))
@@ -644,7 +617,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1610
   :init-specs
   ((:num 0.2)
@@ -664,7 +636,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 7.0000005))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-308
   :id 402
   :bounds (static-bspherem 0 1 0 3.5)
@@ -697,7 +668,6 @@
    (sp-item 1611 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1613 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1612
   :init-specs
   ((:texture (harddot effects))
@@ -715,7 +685,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1611
   :init-specs
   ((:texture (hotdot effects))
@@ -738,7 +707,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1613
   :init-specs
   ((:num 0.2)
@@ -758,7 +726,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-312
   :id 403
   :bounds (static-bspherem 0 1 0 3.5)
@@ -791,7 +758,6 @@
    (sp-item 1614 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1616 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1615
   :init-specs
   ((:texture (harddot effects))
@@ -809,7 +775,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -192.00002))))
 
-;; failed to figure out what this is:
 (defpart 1614
   :init-specs
   ((:texture (hotdot effects))
@@ -832,7 +797,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1616
   :init-specs
   ((:num 0.2)
@@ -852,7 +816,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -192.00002))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-316
   :id 404
   :bounds (static-bspherem 0 1 0 3.5)
@@ -885,7 +848,6 @@
    (sp-item 1617 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1619 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1618
   :init-specs
   ((:texture (harddot effects))
@@ -903,7 +865,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -162))))
 
-;; failed to figure out what this is:
 (defpart 1617
   :init-specs
   ((:texture (hotdot effects))
@@ -926,7 +887,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1619
   :init-specs
   ((:num 0.2)
@@ -946,7 +906,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -162))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-320
   :id 405
   :bounds (static-bspherem 0 1 0 3.5)
@@ -979,7 +938,6 @@
    (sp-item 1620 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1622 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1621
   :init-specs
   ((:texture (harddot effects))
@@ -997,7 +955,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -105))))
 
-;; failed to figure out what this is:
 (defpart 1620
   :init-specs
   ((:texture (hotdot effects))
@@ -1020,7 +977,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1622
   :init-specs
   ((:num 0.2)
@@ -1040,7 +996,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -105))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-324
   :id 406
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1073,7 +1028,6 @@
    (sp-item 1623 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1625 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1624
   :init-specs
   ((:texture (harddot effects))
@@ -1091,7 +1045,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -85))))
 
-;; failed to figure out what this is:
 (defpart 1623
   :init-specs
   ((:texture (hotdot effects))
@@ -1114,7 +1067,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1625
   :init-specs
   ((:num 0.2)
@@ -1134,7 +1086,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -85))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-328
   :id 407
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1167,7 +1118,6 @@
    (sp-item 1626 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1628 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1627
   :init-specs
   ((:texture (harddot effects))
@@ -1185,7 +1135,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -67))))
 
-;; failed to figure out what this is:
 (defpart 1626
   :init-specs
   ((:texture (hotdot effects))
@@ -1208,7 +1157,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1628
   :init-specs
   ((:num 0.2)
@@ -1228,7 +1176,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -67))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-332
   :id 408
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1261,7 +1208,6 @@
    (sp-item 1629 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1631 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1630
   :init-specs
   ((:texture (harddot effects))
@@ -1279,7 +1225,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -20))))
 
-;; failed to figure out what this is:
 (defpart 1629
   :init-specs
   ((:texture (hotdot effects))
@@ -1302,7 +1247,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1631
   :init-specs
   ((:num 0.2)
@@ -1322,7 +1266,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -20))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-333
   :id 409
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1355,7 +1298,6 @@
    (sp-item 1632 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1634 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1633
   :init-specs
   ((:texture (harddot effects))
@@ -1373,7 +1315,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 30))))
 
-;; failed to figure out what this is:
 (defpart 1632
   :init-specs
   ((:texture (hotdot effects))
@@ -1396,7 +1337,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1634
   :init-specs
   ((:num 0.2)
@@ -1416,7 +1356,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 30))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-334
   :id 410
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1449,7 +1388,6 @@
    (sp-item 1635 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1637 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1636
   :init-specs
   ((:texture (harddot effects))
@@ -1467,7 +1405,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 20))))
 
-;; failed to figure out what this is:
 (defpart 1635
   :init-specs
   ((:texture (hotdot effects))
@@ -1490,7 +1427,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1637
   :init-specs
   ((:num 0.2)
@@ -1510,7 +1446,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 20))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-335
   :id 411
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1543,7 +1478,6 @@
    (sp-item 1638 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1640 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1639
   :init-specs
   ((:texture (harddot effects))
@@ -1561,7 +1495,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1638
   :init-specs
   ((:texture (hotdot effects))
@@ -1584,7 +1517,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1640
   :init-specs
   ((:num 0.2)
@@ -1604,7 +1536,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-336
   :id 412
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1637,7 +1568,6 @@
    (sp-item 1641 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1643 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1642
   :init-specs
   ((:texture (harddot effects))
@@ -1655,7 +1585,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1641
   :init-specs
   ((:texture (hotdot effects))
@@ -1678,7 +1607,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1643
   :init-specs
   ((:num 0.2)
@@ -1698,7 +1626,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-337
   :id 413
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1731,7 +1658,6 @@
    (sp-item 1644 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1646 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1645
   :init-specs
   ((:texture (harddot effects))
@@ -1749,7 +1675,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -37))))
 
-;; failed to figure out what this is:
 (defpart 1644
   :init-specs
   ((:texture (hotdot effects))
@@ -1772,7 +1697,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1646
   :init-specs
   ((:num 0.2)
@@ -1792,7 +1716,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -37))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-338
   :id 414
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1825,7 +1748,6 @@
    (sp-item 1647 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1649 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1648
   :init-specs
   ((:texture (harddot effects))
@@ -1843,7 +1765,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -62))))
 
-;; failed to figure out what this is:
 (defpart 1647
   :init-specs
   ((:texture (hotdot effects))
@@ -1866,7 +1787,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1649
   :init-specs
   ((:num 0.2)
@@ -1886,7 +1806,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -62))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-339
   :id 415
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1919,7 +1838,6 @@
    (sp-item 1650 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1652 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1651
   :init-specs
   ((:texture (harddot effects))
@@ -1937,7 +1855,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -85))))
 
-;; failed to figure out what this is:
 (defpart 1650
   :init-specs
   ((:texture (hotdot effects))
@@ -1960,7 +1877,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1652
   :init-specs
   ((:num 0.2)
@@ -1980,7 +1896,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -85))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-340
   :id 416
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2013,7 +1928,6 @@
    (sp-item 1653 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1655 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1654
   :init-specs
   ((:texture (harddot effects))
@@ -2031,7 +1945,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 160))))
 
-;; failed to figure out what this is:
 (defpart 1653
   :init-specs
   ((:texture (hotdot effects))
@@ -2054,7 +1967,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1655
   :init-specs
   ((:num 0.2)
@@ -2074,7 +1986,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 160))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-341
   :id 417
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2107,7 +2018,6 @@
    (sp-item 1656 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1658 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1657
   :init-specs
   ((:texture (harddot effects))
@@ -2125,7 +2035,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees 177))))
 
-;; failed to figure out what this is:
 (defpart 1656
   :init-specs
   ((:texture (hotdot effects))
@@ -2148,7 +2057,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1658
   :init-specs
   ((:num 0.2)
@@ -2168,7 +2076,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees 177))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-357
   :id 418
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2201,7 +2108,6 @@
    (sp-item 1659 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1661 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1660
   :init-specs
   ((:texture (harddot effects))
@@ -2219,7 +2125,6 @@
    (:conerot-radius (meters 0) 4 (meters 1.1))
    (:rotate-y (degrees 131))))
 
-;; failed to figure out what this is:
 (defpart 1659
   :init-specs
   ((:texture (hotdot effects))
@@ -2242,7 +2147,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1661
   :init-specs
   ((:num 0.2)
@@ -2262,7 +2166,6 @@
    (:conerot-radius (meters 0) (meters 4.4))
    (:rotate-y (degrees 131))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-356
   :id 419
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2295,7 +2198,6 @@
    (sp-item 1662 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1664 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1663
   :init-specs
   ((:texture (harddot effects))
@@ -2313,7 +2215,6 @@
    (:conerot-radius (meters 0) 4 (meters 1.1))
    (:rotate-y (degrees 311))))
 
-;; failed to figure out what this is:
 (defpart 1662
   :init-specs
   ((:texture (hotdot effects))
@@ -2336,7 +2237,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1664
   :init-specs
   ((:num 0.2)
@@ -2356,7 +2256,6 @@
    (:conerot-radius (meters 0) (meters 4.4))
    (:rotate-y (degrees 311))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-354
   :id 420
   :bounds (static-bspherem 0 1 0 3.5)
@@ -2389,7 +2288,6 @@
    (sp-item 1665 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1667 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1666
   :init-specs
   ((:texture (harddot effects))
@@ -2407,7 +2305,6 @@
    (:conerot-radius (meters 0) 4 (meters 1.15))
    (:rotate-y (degrees 325))))
 
-;; failed to figure out what this is:
 (defpart 1665
   :init-specs
   ((:texture (hotdot effects))
@@ -2430,7 +2327,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1667
   :init-specs
   ((:num 0.2)
@@ -2450,13 +2346,11 @@
    (:conerot-radius (meters 0) (meters 4.6))
    (:rotate-y (degrees 325))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-sheild
   :id 565
   :bounds (static-bspherem 0 0 0 32)
   :parts ((sp-item 2311) (sp-item 2312 :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 2312
   :init-specs
   ((:texture (water-ring effects))
@@ -2480,11 +2374,9 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:rotate-y (degrees 0) (degrees 360))))
 
-;; failed to figure out what this is:
 (defpart 2313
   :init-specs ((:fade-a 0.0)))
 
-;; failed to figure out what this is:
 (defpart 2311
   :init-specs
   ((:num 4.0 2.0)
@@ -2502,6 +2394,5 @@
    (:next-launcher 2314)
    (:rotate-y (degrees 0) (degrees 360))))
 
-;; failed to figure out what this is:
 (defpart 2314
   :init-specs ((:fade-b 32.768)))
diff --git a/goal_src/jak1/levels/sunken/sunken-part5.gc b/goal_src/jak1/levels/sunken/sunken-part5.gc
index c863045b89..e149b9d8ec 100644
--- a/goal_src/jak1/levels/sunken/sunken-part5.gc
+++ b/goal_src/jak1/levels/sunken/sunken-part5.gc
@@ -7,7 +7,6 @@
 
 ;; DECOMP BEGINS
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-227
   :id 421
   :bounds (static-bspherem 0 1 0 3.5)
@@ -40,7 +39,6 @@
    (sp-item 1668 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1670 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1669
   :init-specs
   ((:texture (harddot effects))
@@ -58,7 +56,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -131))))
 
-;; failed to figure out what this is:
 (defpart 1668
   :init-specs
   ((:texture (hotdot effects))
@@ -81,7 +78,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1670
   :init-specs
   ((:num 0.2)
@@ -101,7 +97,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -131))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-238
   :id 422
   :bounds (static-bspherem 0 1 0 3.5)
@@ -134,7 +129,6 @@
    (sp-item 1671 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1673 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1672
   :init-specs
   ((:texture (harddot effects))
@@ -152,7 +146,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -100.00001))))
 
-;; failed to figure out what this is:
 (defpart 1671
   :init-specs
   ((:texture (hotdot effects))
@@ -175,7 +168,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1673
   :init-specs
   ((:num 0.2)
@@ -195,7 +187,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -100.00001))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-239
   :id 423
   :bounds (static-bspherem 0 1 0 3.5)
@@ -228,7 +219,6 @@
    (sp-item 1674 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1676 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1675
   :init-specs
   ((:texture (harddot effects))
@@ -246,7 +236,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -124.99999))))
 
-;; failed to figure out what this is:
 (defpart 1674
   :init-specs
   ((:texture (hotdot effects))
@@ -269,7 +258,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1676
   :init-specs
   ((:num 0.2)
@@ -289,7 +277,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -124.99999))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-240
   :id 424
   :bounds (static-bspherem 0 1 0 3.5)
@@ -322,7 +309,6 @@
    (sp-item 1677 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1679 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1678
   :init-specs
   ((:texture (harddot effects))
@@ -340,7 +326,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -93))))
 
-;; failed to figure out what this is:
 (defpart 1677
   :init-specs
   ((:texture (hotdot effects))
@@ -363,7 +348,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1679
   :init-specs
   ((:num 0.2)
@@ -383,7 +367,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -93))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-241
   :id 425
   :bounds (static-bspherem 0 1 0 3.5)
@@ -416,7 +399,6 @@
    (sp-item 1680 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1682 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1681
   :init-specs
   ((:texture (harddot effects))
@@ -434,7 +416,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -110))))
 
-;; failed to figure out what this is:
 (defpart 1680
   :init-specs
   ((:texture (hotdot effects))
@@ -457,7 +438,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1682
   :init-specs
   ((:num 0.2)
@@ -477,7 +457,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -110))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-242
   :id 426
   :bounds (static-bspherem 0 1 0 3.5)
@@ -510,7 +489,6 @@
    (sp-item 1683 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1685 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1684
   :init-specs
   ((:texture (harddot effects))
@@ -528,7 +506,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -135))))
 
-;; failed to figure out what this is:
 (defpart 1683
   :init-specs
   ((:texture (hotdot effects))
@@ -551,7 +528,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1685
   :init-specs
   ((:num 0.2)
@@ -571,7 +547,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -135))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-243
   :id 427
   :bounds (static-bspherem 0 1 0 3.5)
@@ -604,7 +579,6 @@
    (sp-item 1686 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1688 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1687
   :init-specs
   ((:texture (harddot effects))
@@ -622,7 +596,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -147))))
 
-;; failed to figure out what this is:
 (defpart 1686
   :init-specs
   ((:texture (hotdot effects))
@@ -645,7 +618,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1688
   :init-specs
   ((:num 0.2)
@@ -665,7 +637,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -147))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-278
   :id 428
   :bounds (static-bspherem 0 1 0 3.5)
@@ -698,7 +669,6 @@
    (sp-item 1689 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1691 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1690
   :init-specs
   ((:texture (harddot effects))
@@ -716,7 +686,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -165))))
 
-;; failed to figure out what this is:
 (defpart 1689
   :init-specs
   ((:texture (hotdot effects))
@@ -739,7 +708,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1691
   :init-specs
   ((:num 0.2)
@@ -759,7 +727,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -165))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-251
   :id 429
   :bounds (static-bspherem 0 1 0 3.5)
@@ -792,7 +759,6 @@
    (sp-item 1692 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1694 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1693
   :init-specs
   ((:texture (harddot effects))
@@ -810,7 +776,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -136))))
 
-;; failed to figure out what this is:
 (defpart 1692
   :init-specs
   ((:texture (hotdot effects))
@@ -833,7 +798,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1694
   :init-specs
   ((:num 0.2)
@@ -853,7 +817,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -136))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-254
   :id 430
   :bounds (static-bspherem 0 1 0 3.5)
@@ -886,7 +849,6 @@
    (sp-item 1695 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1697 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1696
   :init-specs
   ((:texture (harddot effects))
@@ -904,7 +866,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -185))))
 
-;; failed to figure out what this is:
 (defpart 1695
   :init-specs
   ((:texture (hotdot effects))
@@ -927,7 +888,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1697
   :init-specs
   ((:num 0.2)
@@ -947,7 +907,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -185))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-264
   :id 431
   :bounds (static-bspherem 0 1 0 3.5)
@@ -980,7 +939,6 @@
    (sp-item 1698 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1700 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1699
   :init-specs
   ((:texture (harddot effects))
@@ -998,7 +956,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -203))))
 
-;; failed to figure out what this is:
 (defpart 1698
   :init-specs
   ((:texture (hotdot effects))
@@ -1021,7 +978,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1700
   :init-specs
   ((:num 0.2)
@@ -1041,7 +997,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -203))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-265
   :id 432
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1074,7 +1029,6 @@
    (sp-item 1701 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1703 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1702
   :init-specs
   ((:texture (harddot effects))
@@ -1092,7 +1046,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -217))))
 
-;; failed to figure out what this is:
 (defpart 1701
   :init-specs
   ((:texture (hotdot effects))
@@ -1115,7 +1068,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1703
   :init-specs
   ((:num 0.2)
@@ -1135,7 +1087,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -217))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-266
   :id 433
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1168,7 +1119,6 @@
    (sp-item 1704 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1706 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1705
   :init-specs
   ((:texture (harddot effects))
@@ -1186,7 +1136,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -243))))
 
-;; failed to figure out what this is:
 (defpart 1704
   :init-specs
   ((:texture (hotdot effects))
@@ -1209,7 +1158,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1706
   :init-specs
   ((:num 0.2)
@@ -1229,7 +1177,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -243))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-267
   :id 434
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1262,7 +1209,6 @@
    (sp-item 1707 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1709 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1708
   :init-specs
   ((:texture (harddot effects))
@@ -1280,7 +1226,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -267))))
 
-;; failed to figure out what this is:
 (defpart 1707
   :init-specs
   ((:texture (hotdot effects))
@@ -1303,7 +1248,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1709
   :init-specs
   ((:num 0.2)
@@ -1323,7 +1267,6 @@
    (:conerot-radius (meters 0) (meters 4))
    (:rotate-y (degrees -267))))
 
-;; failed to figure out what this is:
 (defpartgroup group-sunken-heatpipe-268
   :id 435
   :bounds (static-bspherem 0 1 0 3.5)
@@ -1356,7 +1299,6 @@
    (sp-item 1710 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1712 :fade-after (meters 64) :falloff-to (meters 64))))
 
-;; failed to figure out what this is:
 (defpart 1711
   :init-specs
   ((:texture (harddot effects))
@@ -1374,7 +1316,6 @@
    (:conerot-radius (meters 0) 4 (meters 1))
    (:rotate-y (degrees -300))))
 
-;; failed to figure out what this is:
 (defpart 1710
   :init-specs
   ((:texture (hotdot effects))
@@ -1397,7 +1338,6 @@
    (:next-time (seconds 0.085) (seconds 0.08))
    (:next-launcher 1422)))
 
-;; failed to figure out what this is:
 (defpart 1712
   :init-specs
   ((:num 0.2)
diff --git a/goal_src/jak1/levels/village2/village2-part2.gc b/goal_src/jak1/levels/village2/village2-part2.gc
index 85c605d706..ecc8029381 100644
--- a/goal_src/jak1/levels/village2/village2-part2.gc
+++ b/goal_src/jak1/levels/village2/village2-part2.gc
@@ -7,19 +7,15 @@
 
 ;; DECOMP BEGINS
 
-;; failed to figure out what this is:
 (defpart 1208
   :init-specs ((:fade-a -0.10666667)))
 
-;; failed to figure out what this is:
 (defpart 1209
   :init-specs ((:fade-a -0.16)))
 
-;; failed to figure out what this is:
 (defpart 1210
   :init-specs ((:fade-a -2.6666667)))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-29
   :id 277
   :flags (always-draw)
@@ -82,7 +78,6 @@
    (sp-item 1241 :fade-after (meters 120) :falloff-to (meters 120))
    (sp-item 1242 :fade-after (meters 120) :falloff-to (meters 120))))
 
-;; failed to figure out what this is:
 (defpart 1211
   :init-specs
   ((:texture (falls-particle effects))
@@ -109,7 +104,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -30))))
 
-;; failed to figure out what this is:
 (defpart 1214
   :init-specs
   ((:texture (falls-particle effects))
@@ -136,7 +130,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1217
   :init-specs
   ((:texture (falls-particle effects))
@@ -163,7 +156,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -110))))
 
-;; failed to figure out what this is:
 (defpart 1220
   :init-specs
   ((:texture (falls-particle effects))
@@ -188,7 +180,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1223
   :init-specs
   ((:texture (falls-particle effects))
@@ -213,7 +204,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1224
   :init-specs
   ((:texture (falls-particle effects))
@@ -240,7 +230,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1212
   :init-specs
   ((:texture (middot effects))
@@ -267,7 +256,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -30))))
 
-;; failed to figure out what this is:
 (defpart 1215
   :init-specs
   ((:texture (middot effects))
@@ -294,7 +282,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1218
   :init-specs
   ((:texture (middot effects))
@@ -321,7 +308,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -110))))
 
-;; failed to figure out what this is:
 (defpart 1221
   :init-specs
   ((:texture (middot effects))
@@ -347,7 +333,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1225
   :init-specs
   ((:texture (middot effects))
@@ -374,7 +359,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1213
   :init-specs
   ((:texture (bigpuff effects))
@@ -402,7 +386,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -30))))
 
-;; failed to figure out what this is:
 (defpart 1216
   :init-specs
   ((:texture (bigpuff effects))
@@ -430,7 +413,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1219
   :init-specs
   ((:texture (bigpuff effects))
@@ -458,7 +440,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -110))))
 
-;; failed to figure out what this is:
 (defpart 1222
   :init-specs
   ((:texture (bigpuff effects))
@@ -485,7 +466,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1227
   :init-specs
   ((:texture (bigpuff effects))
@@ -512,7 +492,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1226
   :init-specs
   ((:texture (bigpuff effects))
@@ -540,7 +519,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1228
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -568,7 +546,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1229
   :init-specs
   ((:texture (water-ring effects))
@@ -591,7 +568,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1230
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -619,7 +595,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1231
   :init-specs
   ((:texture (water-ring effects))
@@ -642,7 +617,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1232
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -670,7 +644,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1233
   :init-specs
   ((:texture (water-ring effects))
@@ -693,7 +666,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1234
   :init-specs
   ((:texture (falls-particle effects))
@@ -720,7 +692,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1235
   :init-specs
   ((:texture (falls-particle effects))
@@ -747,7 +718,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1236
   :init-specs
   ((:texture (middot effects))
@@ -774,7 +744,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1237
   :init-specs
   ((:texture (middot effects))
@@ -801,7 +770,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1238
   :init-specs
   ((:texture (bigpuff effects))
@@ -830,7 +798,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1239
   :init-specs
   ((:texture (bigpuff effects))
@@ -858,7 +825,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1240
   :init-specs
   ((:texture (falls-particle effects))
@@ -887,7 +853,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1241
   :init-specs
   ((:texture (middot effects))
@@ -915,7 +880,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1242
   :init-specs
   ((:texture (bigpuff effects))
@@ -945,7 +909,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-30
   :id 278
   :flags (always-draw)
@@ -961,7 +924,6 @@
    (sp-item 1246 :fade-after (meters 240) :falloff-to (meters 240))
    (sp-item 1247 :fade-after (meters 160) :falloff-to (meters 160) :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 1243
   :init-specs
   ((:texture (falls-particle effects))
@@ -989,7 +951,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1244
   :init-specs
   ((:texture (middot effects))
@@ -1016,7 +977,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1245
   :init-specs
   ((:texture (bigpuff effects))
@@ -1045,7 +1005,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1246
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -1073,7 +1032,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1247
   :init-specs
   ((:texture (water-ring effects))
@@ -1096,14 +1054,12 @@
    (:next-launcher 1208)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-31
   :id 279
   :flags (always-draw)
   :bounds (static-bspherem 0 22 0 35)
   :parts ((sp-item 2324)))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-32
   :id 280
   :flags (always-draw)
@@ -1129,7 +1085,6 @@
    (sp-item 1262 :fade-after (meters 80) :falloff-to (meters 80))
    (sp-item 1263 :fade-after (meters 160) :falloff-to (meters 160))))
 
-;; failed to figure out what this is:
 (defpart 1253
   :init-specs
   ((:texture (falls-particle effects))
@@ -1156,7 +1111,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1264
   :init-specs
   ((:scale-y (meters 1) (meters 1))
@@ -1168,7 +1122,6 @@
    (:next-time (seconds 0.85))
    (:next-launcher 1210)))
 
-;; failed to figure out what this is:
 (defpart 1254
   :init-specs
   ((:texture (middot effects))
@@ -1197,7 +1150,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1265
   :init-specs
   ((:scale-x (meters 0.2) (meters 0.2))
@@ -1207,7 +1159,6 @@
    (:vel-z (meters 0.013333334) (meters 0.026666667))
    (:accel-x (meters -0.00031746033))))
 
-;; failed to figure out what this is:
 (defpart 1255
   :init-specs
   ((:texture (bigpuff effects))
@@ -1235,7 +1186,6 @@
    (:next-launcher 1266)
    (:rotate-y (degrees -15))))
 
-;; failed to figure out what this is:
 (defpart 1266
   :init-specs
   ((:vel-x (meters 0.053333335) (meters 0.013333334))
@@ -1248,7 +1198,6 @@
    (:next-time (seconds 1.35))
    (:next-launcher 1210)))
 
-;; failed to figure out what this is:
 (defpart 1256
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -1276,7 +1225,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees -45))))
 
-;; failed to figure out what this is:
 (defpart 1257
   :init-specs
   ((:texture (water-ring effects))
@@ -1299,7 +1247,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees -90))))
 
-;; failed to figure out what this is:
 (defpart 1258
   :init-specs
   ((:texture (falls-particle effects))
@@ -1326,7 +1273,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees -25.000002))))
 
-;; failed to figure out what this is:
 (defpart 1259
   :init-specs
   ((:texture (middot effects))
@@ -1353,7 +1299,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -25.000002))))
 
-;; failed to figure out what this is:
 (defpart 1260
   :init-specs
   ((:texture (bigpuff effects))
@@ -1381,7 +1326,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees -25.000002))))
 
-;; failed to figure out what this is:
 (defpart 1261
   :init-specs
   ((:texture (falls-particle effects))
@@ -1408,7 +1352,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees 10) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpart 1262
   :init-specs
   ((:texture (middot effects))
@@ -1435,7 +1378,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees -45) (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1263
   :init-specs
   ((:texture (bigpuff effects))
@@ -1463,7 +1405,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 10) (degrees 50.000004))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-33
   :id 281
   :flags (always-draw)
@@ -1489,7 +1430,6 @@
    (sp-item 1276 :fade-after (meters 200) :falloff-to (meters 200))
    (sp-item 1277 :fade-after (meters 160) :falloff-to (meters 160) :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 1267
   :init-specs
   ((:texture (falls-particle effects))
@@ -1516,7 +1456,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1268
   :init-specs
   ((:texture (falls-particle effects))
@@ -1543,7 +1482,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1269
   :init-specs
   ((:texture (middot effects))
@@ -1570,7 +1508,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1270
   :init-specs
   ((:texture (middot effects))
@@ -1597,7 +1534,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1271
   :init-specs
   ((:texture (bigpuff effects))
@@ -1626,7 +1562,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1272
   :init-specs
   ((:texture (bigpuff effects))
@@ -1654,7 +1589,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1273
   :init-specs
   ((:texture (falls-particle effects))
@@ -1683,7 +1617,6 @@
    (:launchrot-x (degrees -8) (degrees 16))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1274
   :init-specs
   ((:texture (middot effects))
@@ -1711,7 +1644,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1275
   :init-specs
   ((:texture (bigpuff effects))
@@ -1741,7 +1673,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1276
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -1769,7 +1700,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpart 1277
   :init-specs
   ((:texture (water-ring effects))
@@ -1792,7 +1722,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees 90))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-waterfall-34
   :id 282
   :flags (always-draw)
@@ -1857,7 +1786,6 @@
    (sp-item 1309 :fade-after (meters 200) :falloff-to (meters 200))
    (sp-item 1310 :fade-after (meters 160) :falloff-to (meters 160) :flags (is-3d))))
 
-;; failed to figure out what this is:
 (defpart 1278
   :init-specs
   ((:texture (falls-particle effects))
@@ -1885,7 +1813,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 120))))
 
-;; failed to figure out what this is:
 (defpart 1281
   :init-specs
   ((:texture (falls-particle effects))
@@ -1913,7 +1840,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 140))))
 
-;; failed to figure out what this is:
 (defpart 1284
   :init-specs
   ((:texture (falls-particle effects))
@@ -1941,7 +1867,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 110))))
 
-;; failed to figure out what this is:
 (defpart 1279
   :init-specs
   ((:texture (middot effects))
@@ -1968,7 +1893,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 120))))
 
-;; failed to figure out what this is:
 (defpart 1282
   :init-specs
   ((:texture (middot effects))
@@ -1995,7 +1919,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 140))))
 
-;; failed to figure out what this is:
 (defpart 1285
   :init-specs
   ((:texture (middot effects))
@@ -2022,7 +1945,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 110))))
 
-;; failed to figure out what this is:
 (defpart 1280
   :init-specs
   ((:texture (bigpuff effects))
@@ -2051,7 +1973,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 120))))
 
-;; failed to figure out what this is:
 (defpart 1283
   :init-specs
   ((:texture (bigpuff effects))
@@ -2080,7 +2001,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 140))))
 
-;; failed to figure out what this is:
 (defpart 1286
   :init-specs
   ((:texture (bigpuff effects))
@@ -2109,7 +2029,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 110))))
 
-;; failed to figure out what this is:
 (defpart 1287
   :init-specs
   ((:texture (falls-particle effects))
@@ -2137,7 +2056,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1290
   :init-specs
   ((:texture (falls-particle effects))
@@ -2165,7 +2083,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1288
   :init-specs
   ((:texture (middot effects))
@@ -2192,7 +2109,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1291
   :init-specs
   ((:texture (middot effects))
@@ -2219,7 +2135,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1289
   :init-specs
   ((:texture (bigpuff effects))
@@ -2248,7 +2163,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1292
   :init-specs
   ((:texture (bigpuff effects))
@@ -2277,7 +2191,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 190))))
 
-;; failed to figure out what this is:
 (defpart 1293
   :init-specs
   ((:texture (falls-particle effects))
@@ -2305,7 +2218,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 60))))
 
-;; failed to figure out what this is:
 (defpart 1294
   :init-specs
   ((:texture (middot effects))
@@ -2332,7 +2244,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 60))))
 
-;; failed to figure out what this is:
 (defpart 1295
   :init-specs
   ((:texture (bigpuff effects))
@@ -2361,7 +2272,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 60))))
 
-;; failed to figure out what this is:
 (defpart 1296
   :init-specs
   ((:texture (falls-particle effects))
@@ -2389,7 +2299,6 @@
    (:launchrot-x (degrees -15) (degrees 30))
    (:rotate-y (degrees 130))))
 
-;; failed to figure out what this is:
 (defpart 1297
   :init-specs
   ((:texture (middot effects))
@@ -2416,7 +2325,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 130))))
 
-;; failed to figure out what this is:
 (defpart 1300
   :init-specs
   ((:texture (middot effects))
@@ -2443,7 +2351,6 @@
    (:launchrot-x (degrees -20) (degrees 40))
    (:rotate-y (degrees 130))))
 
-;; failed to figure out what this is:
 (defpart 1298
   :init-specs
   ((:texture (bigpuff effects))
@@ -2472,7 +2379,6 @@
    (:next-launcher 1210)
    (:rotate-y (degrees 130))))
 
-;; failed to figure out what this is:
 (defpart 1301
   :init-specs
   ((:texture (bigpuff effects))
@@ -2499,7 +2405,6 @@
    (:flags (die-when-faded use-time-of-day-color no-fog))
    (:rotate-y (degrees 130))))
 
-;; failed to figure out what this is:
 (defpart 1302
   :init-specs
   ((:texture (falls-particle effects))
@@ -2527,7 +2432,6 @@
    (:launchrot-y (degrees 100.00001) 1 (degrees 140))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1303
   :init-specs
   ((:texture (falls-particle effects))
@@ -2555,7 +2459,6 @@
    (:launchrot-y (degrees 160) (degrees 40))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1304
   :init-specs
   ((:texture (falls-particle effects))
@@ -2583,7 +2486,6 @@
    (:launchrot-y (degrees 140) (degrees 40))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1305
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -2611,7 +2513,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1307
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -2639,7 +2540,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1309
   :init-specs
   ((:texture (bigpuff-half effects))
@@ -2667,7 +2567,6 @@
    (:next-launcher 1209)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1306
   :init-specs
   ((:texture (water-ring effects))
@@ -2690,7 +2589,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1308
   :init-specs
   ((:texture (water-ring effects))
@@ -2713,7 +2611,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1310
   :init-specs
   ((:texture (water-ring effects))
@@ -2736,7 +2633,6 @@
    (:next-launcher 1208)
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-sagehut-warpgate
   :id 283
   :bounds (static-bspherem 7 4 -4.5 12)
@@ -2917,7 +2813,6 @@
    (sp-item 1312 :flags (auto-rearm start-dead launch-asap))
    (sp-item 1312 :flags (auto-rearm start-dead launch-asap))))
 
-;; failed to figure out what this is:
 (defpart 1315
   :init-specs
   ((:texture (hotdot effects))
@@ -2932,7 +2827,6 @@
    (:flags (glow))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1312
   :init-specs
   ((:texture (middot effects))
@@ -2955,7 +2849,6 @@
    (:timer (seconds 2))
    (:flags (die-when-faded glow orbit))))
 
-;; failed to figure out what this is:
 (defpart 1313
   :init-specs
   ((:num 3.0 3.0)
@@ -2972,7 +2865,6 @@
    (:conerot-radius (meters 4) (meters 3))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1314
   :init-specs
   ((:texture (hotdot effects))
@@ -2985,7 +2877,6 @@
    (:flags (glow))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1311
   :init-specs
   ((:texture (bigpuff effects))
@@ -3009,7 +2900,6 @@
    (:timer (seconds 2.3))
    (:flags (die-when-faded glow orbit))))
 
-;; failed to figure out what this is:
 (defpartgroup group-village2-tree-fire
   :id 284
   :bounds (static-bspherem 0 10 0 12)
@@ -3019,7 +2909,6 @@
    (sp-item 1318 :fade-after (meters 120) :falloff-to (meters 120))
    (sp-item 1319 :fade-after (meters 120) :falloff-to (meters 120))))
 
-;; failed to figure out what this is:
 (defpart 1316
   :init-specs
   ((:texture (bigpuff effects))
@@ -3049,11 +2938,9 @@
    (:conerot-radius (meters 0) (meters 0.5))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1320
   :init-specs ((:fade-a -0.53333336)))
 
-;; failed to figure out what this is:
 (defpart 1317
   :init-specs
   ((:texture (bigpuff effects))
@@ -3082,7 +2969,6 @@
    (:conerot-radius (meters 0) (meters 0.5))
    (:rotate-y (degrees 0))))
 
-;; failed to figure out what this is:
 (defpart 1318
   :init-specs
   ((:texture (bigpuff effects))
@@ -3113,7 +2999,6 @@
    (:conerot-y (degrees 0) (degrees 360))
    (:conerot-radius (meters 4.5))))
 
-;; failed to figure out what this is:
 (defpart 1319
   :init-specs
   ((:texture (bigpuff effects))
diff --git a/goal_src/jak1/old/cavegeyserrock.gc b/goal_src/jak1/old/cavegeyserrock.gc
index ea991f5d7f..c070d3845e 100644
--- a/goal_src/jak1/old/cavegeyserrock.gc
+++ b/goal_src/jak1/old/cavegeyserrock.gc
@@ -9,7 +9,6 @@
 
 ;; decomp begins
 
-;; definition of type cavegeyserrock-control-pt
 (deftype cavegeyserrock-control-pt (structure)
   ((trans  vector :inline :offset-assert 0)
    (transv vector :inline :offset-assert 16))
@@ -17,14 +16,12 @@
   :size-assert #x20
   :flag-assert #x900000020)
 
-;; definition for method 3 of type cavegeyserrock-control-pt
 (defmethod inspect ((obj cavegeyserrock-control-pt))
   (format #t "[~8x] ~A~%" obj 'cavegeyserrock-control-pt)
   (format #t "~Ttrans: #<vector @ #x~X>~%" (-> obj trans))
   (format #t "~Ttransv: #<vector @ #x~X>~%" (-> obj transv))
   obj)
 
-;; definition of type cavegeyserrock
 (deftype cavegeyserrock (process-drawable)
   ((root-override     collide-shape-moving :offset 112)
    (do-burst?         symbol :offset-assert 176)
@@ -44,7 +41,6 @@
   (:methods (dummy-20 (_type_) none 20) (dummy-21 (_type_) none 21))
   (:states cavegeyserrock-idle))
 
-;; definition for method 3 of type cavegeyserrock
 (defmethod inspect ((obj cavegeyserrock))
   (let ((t9-0 (method-of-type process-drawable inspect))) (t9-0 obj))
   (format #t "~T~Tdo-burst?: ~A~%" (-> obj do-burst?))
@@ -59,7 +55,6 @@
   (format #t "~T~Tcontrol-pt[3] @ #x~X~%" (-> obj control-pt))
   obj)
 
-;; failed to figure out what this is:
 (set! (-> *part-group-id-table* 504)
       (new 'static
            'sparticle-launch-group
@@ -82,7 +77,6 @@
            :bounds
            (new 'static 'sphere :w 40960.0)))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1875)
       (new 'static
            'sparticle-launcher
@@ -108,14 +102,12 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1876)
       (new 'static
            'sparticle-launcher
            :init-specs
            (new 'static 'inline-array sp-field-init-spec 2 (sp-flt spt-fade-b -13.653334) (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1869)
       (new 'static
            'sparticle-launcher
@@ -150,7 +142,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1872)
       (new 'static
            'sparticle-launcher
@@ -185,7 +176,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1870)
       (new 'static
            'sparticle-launcher
@@ -220,7 +210,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1873)
       (new 'static
            'sparticle-launcher
@@ -255,7 +244,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1871)
       (new 'static
            'sparticle-launcher
@@ -290,7 +278,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1874)
       (new 'static
            'sparticle-launcher
@@ -325,14 +312,12 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1877)
       (new 'static
            'sparticle-launcher
            :init-specs
            (new 'static 'inline-array sp-field-init-spec 2 (sp-flt spt-fade-a -1.0666667) (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-group-id-table* 505)
       (new 'static
            'sparticle-launch-group
@@ -357,7 +342,6 @@
            :bounds
            (new 'static 'sphere :w 131072.0)))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1880)
       (new 'static
            'sparticle-launcher
@@ -383,7 +367,6 @@
                 (sp-flt spt-conerot-radius (meters 2.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1881)
       (new 'static
            'sparticle-launcher
@@ -407,14 +390,12 @@
                 (sp-launcher-by-id spt-next-launcher 1885)
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1885)
       (new 'static
            'sparticle-launcher
            :init-specs
            (new 'static 'inline-array sp-field-init-spec 3 (sp-flt spt-vel-y (meters 0.0)) (sp-flt spt-accel-y 0.0) (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1879)
       (new 'static
            'sparticle-launcher
@@ -448,7 +429,6 @@
                 (sp-flt spt-conerot-radius (meters 0.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1878)
       (new 'static
            'sparticle-launcher
@@ -482,14 +462,12 @@
                 (sp-flt spt-conerot-radius (meters 0.5))
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1886)
       (new 'static
            'sparticle-launcher
            :init-specs
            (new 'static 'inline-array sp-field-init-spec 2 (sp-flt spt-fade-a -1.6) (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1882)
       (new 'static
            'sparticle-launcher
@@ -518,7 +496,6 @@
                 (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0)
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1883)
       (new 'static
            'sparticle-launcher
@@ -546,7 +523,6 @@
                 (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0)
                 (sp-end))))
 
-;; failed to figure out what this is:
 (set! (-> *part-id-table* 1884)
       (new 'static
            'sparticle-launcher
@@ -567,7 +543,6 @@
                 (sp-rnd-flt spt-rotate-y (degrees 0.0) (degrees 360.0) 1.0)
                 (sp-end))))
 
-;; failed to figure out what this is:
 (let ((v1-22 (new 'static
                   'skeleton-group
                   :art-group-name "cavegeyserrock"
@@ -583,15 +558,11 @@
   (set! (-> v1-22 lod-dist 1) 4095996000.0)
   (set! *cavegeyserrock-sg* v1-22))
 
-;; definition for method 7 of type cavegeyserrock
-;; INFO: Return type mismatch process-drawable vs cavegeyserrock.
 (defmethod relocate ((obj cavegeyserrock) (arg0 int))
   (if (nonzero? (-> obj part2)) (&+! (-> obj part2) arg0))
   (the-as cavegeyserrock
           ((the-as (function process-drawable int process-drawable) (find-parent-method cavegeyserrock 7)) obj arg0)))
 
-;; definition for method 20 of type cavegeyserrock
-;; INFO: Return type mismatch object vs none.
 (defmethod dummy-20 ((obj cavegeyserrock))
   (with-pp
     (when *target*
@@ -621,9 +592,6 @@
                     (send-event-function *target* a1-2)))))))))
     (none)))
 
-;; definition for method 21 of type cavegeyserrock
-;; INFO: Return type mismatch quaternion vs none.
-;; Used lq/sq
 (defmethod dummy-21 ((obj cavegeyserrock))
   (local-vars (at-0 int) (at-1 int) (s5-0 symbol))
   (rlet ((vf0 :class vf)
@@ -734,7 +702,6 @@
                                       s5-1))
     (none)))
 
-;; failed to figure out what this is:
 (defstate cavegeyserrock-idle (cavegeyserrock)
   :trans
     (the-as (function none :behavior cavegeyserrock)
@@ -750,15 +717,11 @@
     (the-as (function none :behavior cavegeyserrock)
             rider-post))
 
-;; definition for method 10 of type cavegeyserrock
 (defmethod deactivate ((obj cavegeyserrock))
   (if (nonzero? (-> obj part2)) (kill-and-free-particles (-> obj part2)))
   ((method-of-type process-drawable deactivate) obj)
   (none))
 
-;; definition for function cavecrystal-light-control-cavegeyserrock-callback
-;; INFO: Return type mismatch object vs none.
-;; Used lq/sq
 (defun cavecrystal-light-control-cavegeyserrock-callback ((arg0 (pointer process-drawable)) (arg1 int) (arg2 float) (arg3 object) (arg4 vector))
   (let ((s5-0 (new 'stack-no-clear 'vector)))
     (let ((v1-1 (-> arg0 0 node-list)))
@@ -773,9 +736,6 @@
       (set-fade! *palette-fade-controls* 0 f30-0 0.0 arg4)))
   (none))
 
-;; definition for method 11 of type cavegeyserrock
-;; INFO: Return type mismatch object vs none.
-;; Used lq/sq
 (defmethod copy-defaults! ((obj cavegeyserrock) (arg0 res-lump))
   (local-vars (sv-16 int) (sv-32 int))
   (set! (-> obj mask) (logior (process-mask platform) (-> obj mask)))