* Remove lots and lots of redundant comments

30 files changed, 142 insertions, 369 deletions

diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 68aab6c1..3dc7ef4d 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -91,7 +91,6 @@ qboolean CG_RequestScores( void )
     // the scores are more than two seconds out of data,
     // so request new ones
     cg.scoresRequestTime = cg.time;
-    //TA: added \n SendClientCommand doesn't call flush( )?
     trap_SendClientCommand( "score\n" );
 
     return qtrue;
@@ -239,7 +238,7 @@ qboolean CG_ConsoleCommand( void )
 
   cmd = CG_Argv( 0 );
 
-  //TA: ugly hacky special case
+  // ugly hacky special case
   if( !Q_stricmp( cmd, "ui_menu" ) )
   {
     arg1 = CG_Argv( 1 );
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index ef15b798..61745111 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -74,8 +74,6 @@ int CG_Text_Width( const char *text, float scale, int limit )
       else
       {
         glyph = &font->glyphs[ (int)*s ];
-        //TTimo: FIXME: getting nasty warnings without the cast,
-        //hopefully this doesn't break the VM build
         out += glyph->xSkip;
         s++;
         count++;
@@ -92,8 +90,6 @@ int CG_Text_Height( const char *text, float scale, int limit )
   float       max;
   glyphInfo_t *glyph;
   float       useScale;
-// TTimo: FIXME
-//  const unsigned char *s = text;
   const char  *s = text;
   fontInfo_t  *font = &cgDC.Assets.textFont;
 
@@ -122,8 +118,6 @@ int CG_Text_Height( const char *text, float scale, int limit )
       else
       {
         glyph = &font->glyphs[ (int)*s ];
-        //TTimo: FIXME: getting nasty warnings without the cast,
-        //hopefully this doesn't break the VM build
         if( max < glyph->height )
           max = glyph->height;
 
@@ -163,8 +157,7 @@ void CG_Text_Paint( float x, float y, float scale, vec4_t color, const char *tex
   useScale = scale * font->glyphScale;
   if( text )
   {
-// TTimo: FIXME
-//    const unsigned char *s = text;
+
     const char *s = text;
 
     trap_R_SetColor( color );
@@ -178,8 +171,6 @@ void CG_Text_Paint( float x, float y, float scale, vec4_t color, const char *tex
     while( s && *s && count < len )
     {
       glyph = &font->glyphs[ (int)*s ];
-      //TTimo: FIXME: getting nasty warnings without the cast,
-      //hopefully this doesn't break the VM build
 
       if( Q_IsColorString( s ) )
       {
@@ -1481,8 +1472,6 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, float scale,
 
   if( text )
   {
-// TTimo: FIXME
-//    const unsigned char *s = text; // bk001206 - unsigned
     const char *s = text;
     float max = *maxX;
     float useScale;
@@ -1505,8 +1494,6 @@ static void CG_Text_Paint_Limit( float *maxX, float x, float y, float scale,
     while( s && *s && count < len )
     {
       glyph = &font->glyphs[ (int)*s ];
-      //TTimo: FIXME: getting nasty warnings without the cast,
-      //hopefully this doesn't break the VM build
 
       if( Q_IsColorString( s ) )
       {
@@ -1574,7 +1561,7 @@ static void CG_DrawTeamSpectators( rectDef_t *rect, float scale, vec4_t color, q
       {
         if( cg.spectatorOffset < cg.spectatorLen )
         {
-          //TA: skip colour directives
+          // skip colour directives
           if( Q_IsColorString( &cg.spectatorList[ cg.spectatorOffset ] ) )
             cg.spectatorOffset += 2;
           else
@@ -1704,7 +1691,6 @@ static void CG_DrawStageReport( rectDef_t *rect, float text_x, float text_y,
 CG_DrawFPS
 ==================
 */
-//TA: personally i think this should be longer - it should really be a cvar
 #define FPS_FRAMES  20
 #define FPS_STRING  "fps"
 static void CG_DrawFPS( rectDef_t *rect, float text_x, float text_y,
@@ -3282,7 +3268,6 @@ static void CG_Draw2D( void )
     return;
   }
 
-  //TA: draw the lighting effects e.g. nvg
   CG_DrawLighting( );
 
 
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 38ee43e9..dba61fd3 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -551,7 +551,7 @@ typedef struct trailBeam_s
 // because corpses after respawn are outside the normal
 // client numbering range
 
-//TA: smoothing of view and model for WW transitions
+// smoothing of view and model for WW transitions
 #define   MAXSMOOTHS          32
 
 typedef struct
@@ -634,7 +634,6 @@ typedef struct centity_s
 
   lerpFrame_t           lerpFrame;
 
-  //TA:
   buildableAnimNumber_t buildableAnim;    //persistant anim number
   buildableAnimNumber_t oldBuildableAnim; //to detect when new anims are set
   particleSystem_t      *buildablePS;
@@ -869,7 +868,6 @@ typedef struct
 
 //======================================================================
 
-//TA:
 typedef struct
 {
   vec3_t    alienBuildablePos[ MAX_GENTITIES ];
@@ -1099,10 +1097,10 @@ typedef struct
   char          testModelBarrelName[MAX_QPATH];
   qboolean      testGun;
 
-  int           spawnTime;                          //TA: fovwarp
-  int           weapon1Time;                        //TA: time when BUTTON_ATTACK went t->f f->t
-  int           weapon2Time;                        //TA: time when BUTTON_ATTACK2 went t->f f->t
-  int           weapon3Time;                        //TA: time when BUTTON_USE_HOLDABLE went t->f f->t
+  int           spawnTime;                          // fovwarp
+  int           weapon1Time;                        // time when BUTTON_ATTACK went t->f f->t
+  int           weapon2Time;                        // time when BUTTON_ATTACK2 went t->f f->t
+  int           weapon3Time;                        // time when BUTTON_USE_HOLDABLE went t->f f->t
   qboolean      weapon1Firing;
   qboolean      weapon2Firing;
   qboolean      weapon3Firing;
@@ -1110,15 +1108,15 @@ typedef struct
   int           boostedTime;
   int           poisonedTime;
 
-  vec3_t        lastNormal;                         //TA: view smoothage
-  vec3_t        lastVangles;                        //TA: view smoothage
-  smooth_t      sList[ MAXSMOOTHS ];                //TA: WW smoothing
+  vec3_t        lastNormal;                         // view smoothage
+  vec3_t        lastVangles;                        // view smoothage
+  smooth_t      sList[ MAXSMOOTHS ];                // WW smoothing
 
-  int           forwardMoveTime;                    //TA: for struggling
+  int           forwardMoveTime;                    // for struggling
   int           rightMoveTime;
   int           upMoveTime;
 
-  float         charModelFraction;                  //TA: loading percentages
+  float         charModelFraction;                  // loading percentages
   float         mediaFraction;
   float         buildablesFraction;
 
@@ -1368,7 +1366,7 @@ typedef struct
 
   clientInfo_t  clientinfo[ MAX_CLIENTS ];
 
-  //TA: corpse info
+  // corpse info
   clientInfo_t  corpseinfo[ MAX_CLIENTS ];
 
   int           cursorX;
@@ -1392,13 +1390,9 @@ extern  cgs_t     cgs;
 extern  cg_t      cg;
 extern  centity_t cg_entities[ MAX_GENTITIES ];
 
-//TA: weapon limit expanded:
-//extern  weaponInfo_t  cg_weapons[MAX_WEAPONS];
 extern  weaponInfo_t    cg_weapons[ 32 ];
-//TA: upgrade infos:
 extern  upgradeInfo_t   cg_upgrades[ 32 ];
 
-//TA: buildable infos:
 extern  buildableInfo_t cg_buildables[ BA_NUM_BUILDABLES ];
 
 extern  markPoly_t      cg_markPolys[ MAX_MARK_POLYS ];
@@ -1518,7 +1512,6 @@ extern  vmCvar_t    cg_painBlendMax;
 extern  vmCvar_t    cg_painBlendScale;
 extern  vmCvar_t    cg_painBlendZoom;
 
-//TA: hack to get class an carriage through to UI module
 extern  vmCvar_t    ui_currentClass;
 extern  vmCvar_t    ui_carriage;
 extern  vmCvar_t    ui_stages;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index eab3d0f2..3f20ce20 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -101,8 +101,6 @@ cg_t        cg;
 cgs_t       cgs;
 centity_t   cg_entities[ MAX_GENTITIES ];
 
-//TA: weapons limit expanded:
-//weaponInfo_t    cg_weapons[MAX_WEAPONS];
 weaponInfo_t    cg_weapons[ 32 ];
 upgradeInfo_t   cg_upgrades[ 32 ];
 
@@ -225,7 +223,6 @@ vmCvar_t  cg_painBlendMax;
 vmCvar_t  cg_painBlendScale;
 vmCvar_t  cg_painBlendZoom;
 
-//TA: hack to get class and carriage through to UI module
 vmCvar_t  ui_currentClass;
 vmCvar_t  ui_carriage;
 vmCvar_t  ui_stages;
@@ -785,7 +782,7 @@ static void CG_RegisterGraphics( void )
   cgs.media.backTileShader            = trap_R_RegisterShader( "console" );
 
 
-  //TA: building shaders
+  // building shaders
   cgs.media.greenBuildShader          = trap_R_RegisterShader("gfx/misc/greenbuild" );
   cgs.media.redBuildShader            = trap_R_RegisterShader("gfx/misc/redbuild" );
   cgs.media.humanSpawningShader       = trap_R_RegisterShader("models/buildables/telenode/rep_cyl" );
@@ -1221,7 +1218,7 @@ qboolean CG_Asset_Parse( int handle )
     }
   }
 
-  return qfalse; // bk001204 - why not?
+  return qfalse;
 }
 
 void CG_ParseMenu( const char *menuFile )
@@ -1614,7 +1611,7 @@ static void CG_RunCinematicFrame( int handle )
   trap_CIN_RunCinematic( handle );
 }
 
-//TA: hack to prevent warning
+// hack to prevent warning
 static qboolean CG_OwnerDrawVisible( int parameter )
 {
   return qfalse;
@@ -1737,24 +1734,22 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
   //inform UI to repress cursor whilst loading
   trap_Cvar_Set( "ui_loading", "1" );
 
-  //TA: load overrides
+  // load overrides
   BG_InitClassOverrides( );
   BG_InitBuildableOverrides( );
   BG_InitAllowedGameElements( );
 
-  //TA: dyn memory
+  // Dynamic memory
   CG_InitMemory( );
 
   CG_RegisterCvars( );
 
   CG_InitConsoleCommands( );
 
-  //TA: moved up for LoadHudMenu
   String_Init( );
 
-  //TA: TA UI
   CG_AssetCache( );
-  CG_LoadHudMenu( );      // load new hud stuff
+  CG_LoadHudMenu( );
 
   cg.weaponSelect = WP_NONE;
   cg.boostedTime = -1;
@@ -1803,7 +1798,6 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
   CG_InitUpgrades( );
   CG_UpdateMediaFraction( 1.0f );
 
-  //TA:
   CG_InitBuildables( );
 
   CG_RegisterClients( );   // if low on memory, some clients will be deferred
diff --git a/src/cgame/cg_scanner.c b/src/cgame/cg_scanner.c
index ab98b23c..0711c1db 100644
--- a/src/cgame/cg_scanner.c
+++ b/src/cgame/cg_scanner.c
@@ -60,7 +60,7 @@ void CG_UpdateEntityPositions( void )
 
     if( cent->currentState.eType == ET_BUILDABLE )
     {
-      //TA: add to list of item positions (for creep)
+      // add to list of item positions (for creep)
       if( cent->currentState.modelindex2 == BIT_ALIENS )
       {
         VectorCopy( cent->lerpOrigin, entityPositions.alienBuildablePos[
diff --git a/src/cgame/cg_snapshot.c b/src/cgame/cg_snapshot.c
index f439a699..bb5ec858 100644
--- a/src/cgame/cg_snapshot.c
+++ b/src/cgame/cg_snapshot.c
@@ -142,9 +142,6 @@ static void CG_TransitionSnapshot( void )
   // execute any server string commands before transitioning entities
   CG_ExecuteNewServerCommands( cg.nextSnap->serverCommandSequence );
 
-  // if we had a map_restart, set everthing with initial
-  if( !cg.snap ) { } //TA: ?
-
   // clear the currentValid flag for all entities in the existing snapshot
   for( i = 0; i < cg.snap->numEntities; i++ )
   {
diff --git a/src/game/bg_lib.c b/src/game/bg_lib.c
index 54d1ed59..8594db44 100644
--- a/src/game/bg_lib.c
+++ b/src/game/bg_lib.c
@@ -70,7 +70,6 @@ static const char rcsid[] =
   "$Id$";
 #endif /* LIBC_SCCS and not lint */
 
-// bk001127 - needed for DLL's
 #if !defined( Q3_VM )
 typedef int    cmp_t(const void *, const void *);
 #endif
@@ -217,7 +216,6 @@ loop: SWAPINIT(a, es);
 
 // this file is excluded from release builds because of intrinsics
 
-// bk001211 - gcc errors on compiling strcpy:  parse error before `__extension__'
 #if defined ( Q3_VM )
 
 size_t strlen( const char *string )
@@ -272,7 +270,6 @@ int strcmp( const char *string1, const char *string2 )
   return *string1 - *string2;
 }
 
-//TA:
 char *strrchr( const char *string, int c )
 {
   int   i, length = strlen( string );
@@ -321,7 +318,7 @@ char *strstr( const char *string, const char *strCharSet )
   return (char *)0;
 }
 
-#endif // bk001211
+#endif
 
 #if defined ( Q3_VM )
 
@@ -830,8 +827,6 @@ double rint( double v )
     return floor( v );
 }
 
-// bk001127 - guarded this tan replacement
-// ld: undefined versioned symbol name tan@@GLIBC_2.0
 double tan( double x )
 {
   return sin( x ) / cos( x );
@@ -1414,7 +1409,7 @@ double _atof( const char **stringPtr )
   const char  *string;
   float sign;
   float value;
-  int   c = '0'; // bk001211 - uninitialized use possible
+  int   c = '0';
 
   string = *stringPtr;
 
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 58e9fbdc..8286b51d 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -4604,7 +4604,7 @@ char *eventnames[ ] =
   "EV_FIRE_WEAPON2",
   "EV_FIRE_WEAPON3",
 
-  "EV_PLAYER_RESPAWN", //TA: for fovwarp effects
+  "EV_PLAYER_RESPAWN", // for fovwarp effects
   "EV_PLAYER_TELEPORT_IN",
   "EV_PLAYER_TELEPORT_OUT",
 
@@ -4636,11 +4636,11 @@ char *eventnames[ ] =
 
   "EV_GIB_PLAYER",      // gib a previously living player
 
-  "EV_BUILD_CONSTRUCT", //TA
-  "EV_BUILD_DESTROY",   //TA
-  "EV_BUILD_DELAY",     //TA: can't build yet
-  "EV_BUILD_REPAIR",    //TA: repairing buildable
-  "EV_BUILD_REPAIRED",  //TA: buildable has full health
+  "EV_BUILD_CONSTRUCT",
+  "EV_BUILD_DESTROY",
+  "EV_BUILD_DELAY",     // can't build yet
+  "EV_BUILD_REPAIR",    // repairing buildable
+  "EV_BUILD_REPAIRED",  // buildable has full health
   "EV_HUMAN_BUILDABLE_EXPLOSION",
   "EV_ALIEN_BUILDABLE_EXPLOSION",
   "EV_ALIEN_ACIDTUBE",
@@ -4654,13 +4654,13 @@ char *eventnames[ ] =
   "EV_STOPLOOPINGSOUND",
   "EV_TAUNT",
 
-  "EV_OVERMIND_ATTACK", //TA: overmind under attack
-  "EV_OVERMIND_DYING",  //TA: overmind close to death
-  "EV_OVERMIND_SPAWNS", //TA: overmind needs spawns
+  "EV_OVERMIND_ATTACK", // overmind under attack
+  "EV_OVERMIND_DYING",  // overmind close to death
+  "EV_OVERMIND_SPAWNS", // overmind needs spawns
 
-  "EV_DCC_ATTACK",      //TA: dcc under attack
+  "EV_DCC_ATTACK",      // dcc under attack
 
-  "EV_RPTUSE_SOUND"     //TA: trigger a sound
+  "EV_RPTUSE_SOUND"     // trigger a sound
 };
 
 /*
@@ -4734,8 +4734,6 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
   if( snap )
     SnapVector( s->apos.trBase );
 
-  //TA: i need for other things :)
-  //s->angles2[YAW] = ps->movementDir;
   s->time2 = ps->movementDir;
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
@@ -4787,10 +4785,10 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
     }
   }
 
-  //TA: use powerups field to store team/class info:
+  // use powerups field to store team/class info:
   s->powerups = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
 
-  //TA: have to get the surfNormal thru somehow...
+  // have to get the surfNormal through somehow...
   VectorCopy( ps->grapplePoint, s->angles2 );
   if( ps->stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING )
     s->eFlags |= EF_WALLCLIMBCEILING;
@@ -4844,8 +4842,6 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
   if( snap )
     SnapVector( s->apos.trBase );
 
-  //TA: i need for other things :)
-  //s->angles2[YAW] = ps->movementDir;
   s->time2 = ps->movementDir;
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
@@ -4899,10 +4895,10 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
     }
   }
 
-  //TA: use powerups field to store team/class info:
+  // use powerups field to store team/class info:
   s->powerups = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
 
-  //TA: have to get the surfNormal thru somehow...
+  // have to get the surfNormal through somehow...
   VectorCopy( ps->grapplePoint, s->angles2 );
   if( ps->stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING )
     s->eFlags |= EF_WALLCLIMBCEILING;
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 85a97526..f247d1b4 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -234,7 +234,7 @@ static void PM_Friction( void )
 
   vel = pm->ps->velocity;
 
-  //TA: make sure vertical velocity is NOT set to zero when wall climbing
+  // make sure vertical velocity is NOT set to zero when wall climbing
   VectorCopy( vel, vec );
   if( pml.walking && !( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) )
     vec[ 2 ] = 0; // ignore slope movement
@@ -705,13 +705,13 @@ static qboolean PM_CheckJump( void )
   pml.walking = qfalse;
   pm->ps->pm_flags |= PMF_JUMP_HELD;
 
-  //TA: take some stamina off
+  // take some stamina off
   if( pm->ps->stats[ STAT_PTEAM ] == PTE_HUMANS )
     pm->ps->stats[ STAT_STAMINA ] -= 500;
 
   pm->ps->groundEntityNum = ENTITYNUM_NONE;
 
-  //TA: jump away from wall
+  // jump away from wall
   if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING )
   {
     vec3_t normal = { 0, 0, -1 };
@@ -1468,7 +1468,6 @@ Returns an event number apropriate for the groundsurface
 */
 static int PM_FootstepForSurface( void )
 {
-  //TA:
   if( pm->ps->stats[ STAT_STATE ] & SS_CREEPSLOWED )
     return EV_FOOTSTEP_SQUELCH;
 
@@ -1717,8 +1716,8 @@ static void PM_GroundClimbTrace( void )
   float     ldDOTtCs, d;
   vec3_t    abc;
 
-  //TA: If we're on the ceiling then grapplePoint is a rotation normal.. otherwise its a surface normal.
-  //    would have been nice if Carmack had left a few random variables in the ps struct for mod makers
+  // If we're on the ceiling then grapplePoint is a rotation normal.. otherwise its a surface normal.
+  // would have been nice if Carmack had left a few random variables in the ps struct for mod makers
   if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBINGCEILING )
     VectorCopy( ceilingNormal, surfNormal );
   else
@@ -2280,7 +2279,6 @@ static void PM_CheckDuck (void)
   BG_FindBBoxForClass( pm->ps->stats[ STAT_PCLASS ], PCmins, PCmaxs, PCcmaxs, NULL, NULL );
   BG_FindViewheightForClass( pm->ps->stats[ STAT_PCLASS ], &PCvh, &PCcvh );
 
-  //TA: iD bug? you can still crouch when you're a spectator
   if( pm->ps->persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
     PCcvh = PCvh;
 
@@ -2299,7 +2297,7 @@ static void PM_CheckDuck (void)
     return;
   }
 
-  //TA: If the standing and crouching viewheights are the same the class can't crouch
+  // If the standing and crouching viewheights are the same the class can't crouch
   if( ( pm->cmd.upmove < 0 ) && ( PCvh != PCcvh ) &&
       pm->ps->pm_type != PM_JETPACK &&
       !BG_InventoryContainsUpgrade( UP_BATTLESUIT, pm->ps->stats ) )
@@ -2354,7 +2352,7 @@ static void PM_Footsteps( void )
   //
   if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) && ( pml.groundPlane ) )
   {
-    //TA: FIXME: yes yes i know this is wrong
+    // FIXME: yes yes i know this is wrong
     pm->xyspeed = sqrt( pm->ps->velocity[ 0 ] * pm->ps->velocity[ 0 ]
                       + pm->ps->velocity[ 1 ] * pm->ps->velocity[ 1 ]
                       + pm->ps->velocity[ 2 ] * pm->ps->velocity[ 2 ] );
@@ -2707,7 +2705,7 @@ static void PM_Weapon( void )
   // again if lowering or raising
   if( pm->ps->weaponTime <= 0 || pm->ps->weaponstate != WEAPON_FIRING )
   {
-    //TA: must press use to switch weapons
+    // must press use to switch weapons
     if( pm->cmd.buttons & BUTTON_USE_HOLDABLE )
     {
       if( !( pm->ps->pm_flags & PMF_USE_ITEM_HELD ) )
@@ -2921,7 +2919,7 @@ static void PM_Weapon( void )
       break;
   }
 
-  //TA: fire events for non auto weapons
+  // fire events for non auto weapons
   if( attack3 )
   {
     if( BG_WeaponHasThirdMode( pm->ps->weapon ) )
@@ -2969,7 +2967,7 @@ static void PM_Weapon( void )
     addTime = BG_FindRepeatRate1ForWeapon( pm->ps->weapon );
   }
 
-  //TA: fire events for autohit weapons
+  // fire events for autohit weapons
   if( pm->autoWeaponHit[ pm->ps->weapon ] )
   {
     switch( pm->ps->weapon )
@@ -3434,7 +3432,7 @@ void PmoveSingle( pmove_t *pmove )
   {
     if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) &&
         ( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) )
-      PM_ClimbMove( ); //TA: walking on any surface
+      PM_ClimbMove( ); // walking on any surface
     else
       PM_WalkMove( ); // walking on ground
   }
@@ -3445,7 +3443,7 @@ void PmoveSingle( pmove_t *pmove )
 
   // set groundentity, watertype, and waterlevel
   PM_GroundTrace( );
-  //TA: must update after every GroundTrace() - yet more clock cycles down the drain :( (14 vec rotations/frame)
+
   // update the viewangles
   PM_UpdateViewAngles( pm->ps, &pm->cmd );
 
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 2f4f3a1a..0ea1ac63 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MINS_Z                  -24
 #define DEFAULT_VIEWHEIGHT      26
 #define CROUCH_VIEWHEIGHT       12
-#define DEAD_VIEWHEIGHT         -14 //TA: watch for mins[ 2 ] less than this causing
+#define DEAD_VIEWHEIGHT         -14 // watch for mins[ 2 ] less than this causing
 
 //
 // config strings are a general means of communicating variable length strings
@@ -67,9 +67,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define CS_WINNER           23    // string indicating round winner
 #define CS_SHADERSTATE      24
 #define CS_BOTINFO          25
-#define CS_CLIENTS_READY    26    //TA: following suggestion in STAT_ enum STAT_CLIENTS_READY becomes a configstring
+#define CS_CLIENTS_READY    26
 
-//TA: extra stuff:
 #define CS_BUILDPOINTS      28
 #define CS_STAGES           29
 #define CS_SPAWNS           30
@@ -139,12 +138,12 @@ typedef enum
 #define PMF_TIME_WATERJUMP  256     // pm_time is waterjump
 #define PMF_RESPAWNED       512     // clear after attack and jump buttons come up
 #define PMF_USE_ITEM_HELD   1024
-#define PMF_WEAPON_RELOAD   2048    //TA: force a weapon switch
+#define PMF_WEAPON_RELOAD   2048    // force a weapon switch
 #define PMF_FOLLOW          4096    // spectate following another player
-#define PMF_QUEUED          8192    //TA: player is queued
-#define PMF_TIME_WALLJUMP   16384   //TA: for limiting wall jumping
-#define PMF_CHARGE          32768   //TA: keep track of pouncing
-#define PMF_WEAPON_SWITCH   65536   //TA: force a weapon switch
+#define PMF_QUEUED          8192    // player is queued
+#define PMF_TIME_WALLJUMP   16384   // for limiting wall jumping
+#define PMF_CHARGE          32768   // keep track of pouncing
+#define PMF_WEAPON_SWITCH   65536   // force a weapon switch
 
 
 #define PMF_ALL_TIMES (PMF_TIME_WATERJUMP|PMF_TIME_LAND|PMF_TIME_KNOCKBACK|PMF_TIME_WALLJUMP)
@@ -206,19 +205,19 @@ typedef enum
 {
   STAT_HEALTH,
   STAT_ITEMS,
-  STAT_SLOTS,           //TA: tracks the amount of stuff human players are carrying
+  STAT_SLOTS,           // tracks the amount of stuff human players are carrying
   STAT_ACTIVEITEMS,
   STAT_WEAPONS,         // 16 bit fields
-  STAT_WEAPONS2,        //TA: another 16 bits to push the max weapon count up
+  STAT_WEAPONS2,        // another 16 bits to push the max weapon count up
   STAT_MAX_HEALTH, // health / armor limit, changable by handicap
-  STAT_PCLASS,    //TA: player class (for aliens AND humans)
-  STAT_PTEAM,     //TA: player team
-  STAT_STAMINA,   //TA: stamina (human only)
-  STAT_STATE,     //TA: client states e.g. wall climbing
-  STAT_MISC,      //TA: for uh...misc stuff
-  STAT_BUILDABLE, //TA: which ghost model to display for building
-  STAT_FALLDIST,  //TA: the distance the player fell
-  STAT_VIEWLOCK   //TA: direction to lock the view in
+  STAT_PCLASS,    // player class (for aliens AND humans)
+  STAT_PTEAM,     // player team
+  STAT_STAMINA,   // stamina (human only)
+  STAT_STATE,     // client states e.g. wall climbing
+  STAT_MISC,      // for uh...misc stuff
+  STAT_BUILDABLE, // which ghost model to display for building
+  STAT_FALLDIST,  // the distance the player fell
+  STAT_VIEWLOCK   // direction to lock the view in
 } statIndex_t;
 
 #define SCA_WALLCLIMBER         0x00000001
@@ -262,7 +261,6 @@ typedef enum
   PERS_ATTACKER,        // clientnum of last damage inflicter
   PERS_KILLED,          // count of the number of times you died
 
-  //TA:
   PERS_STATE,
   PERS_CREDIT,    // human credit
   PERS_BANK,      // human credit in the bank
@@ -403,7 +401,7 @@ typedef enum
   WUT_NUM_TEAMS
 } WUTeam_t;
 
-//TA: bitmasks for upgrade slots
+// bitmasks for upgrade slots
 #define SLOT_NONE       0x00000000
 #define SLOT_HEAD       0x00000001
 #define SLOT_TORSO      0x00000002
@@ -520,7 +518,7 @@ typedef enum
   EV_FIRE_WEAPON2,
   EV_FIRE_WEAPON3,
 
-  EV_PLAYER_RESPAWN, //TA: for fovwarp effects
+  EV_PLAYER_RESPAWN, // for fovwarp effects
   EV_PLAYER_TELEPORT_IN,
   EV_PLAYER_TELEPORT_OUT,
 
@@ -552,11 +550,11 @@ typedef enum
 
   EV_GIB_PLAYER,      // gib a previously living player
 
-  EV_BUILD_CONSTRUCT, //TA
-  EV_BUILD_DESTROY,   //TA
-  EV_BUILD_DELAY,     //TA: can't build yet
-  EV_BUILD_REPAIR,    //TA: repairing buildable
-  EV_BUILD_REPAIRED,  //TA: buildable has full health
+  EV_BUILD_CONSTRUCT,
+  EV_BUILD_DESTROY,
+  EV_BUILD_DELAY,     // can't build yet
+  EV_BUILD_REPAIR,    // repairing buildable
+  EV_BUILD_REPAIRED,  // buildable has full health
   EV_HUMAN_BUILDABLE_EXPLOSION,
   EV_ALIEN_BUILDABLE_EXPLOSION,
   EV_ALIEN_ACIDTUBE,
@@ -570,13 +568,13 @@ typedef enum
   EV_STOPLOOPINGSOUND,
   EV_TAUNT,
 
-  EV_OVERMIND_ATTACK, //TA: overmind under attack
-  EV_OVERMIND_DYING,  //TA: overmind close to death
-  EV_OVERMIND_SPAWNS, //TA: overmind needs spawns
+  EV_OVERMIND_ATTACK, // overmind under attack
+  EV_OVERMIND_DYING,  // overmind close to death
+  EV_OVERMIND_SPAWNS, // overmind needs spawns
 
-  EV_DCC_ATTACK,      //TA: dcc under attack
+  EV_DCC_ATTACK,      // dcc under attack
 
-  EV_RPTUSE_SOUND     //TA: trigger a sound
+  EV_RPTUSE_SOUND     // trigger a sound
 } entity_event_t;
 
 typedef enum
@@ -738,7 +736,7 @@ typedef enum
   MAX_NONSEG_PLAYER_TOTALANIMATIONS
 } nonSegPlayerAnimNumber_t;
 
-//TA: for buildable animations
+// for buildable animations
 typedef enum
 {
   BANIM_NONE,
@@ -798,7 +796,7 @@ typedef enum
 // How many players on the overlay
 #define TEAM_MAXOVERLAY   32
 
-//TA: player classes
+// player classes
 typedef enum
 {
   PCL_NONE,
@@ -825,7 +823,7 @@ typedef enum
 } pClass_t;
 
 
-//TA: player teams
+// player teams
 typedef enum
 {
   PTE_NONE,
@@ -892,7 +890,7 @@ typedef enum
 
 //---------------------------------------------------------
 
-//TA: player class record
+// player class record
 typedef struct
 {
   int       classNum;
@@ -976,7 +974,7 @@ typedef enum
 
 #define MAX_BUILDABLE_MODELS 4
 
-//TA: buildable item record
+// buildable item record
 typedef struct
 {
   int       buildNum;
@@ -1040,7 +1038,7 @@ typedef struct
   float     zOffset;
 } buildableAttributeOverrides_t;
 
-//TA: weapon record
+// weapon record
 typedef struct
 {
   int       weaponNum;
@@ -1078,7 +1076,7 @@ typedef struct
   WUTeam_t  team;
 } weaponAttributes_t;
 
-//TA: upgrade record
+// upgrade record
 typedef struct
 {
   int       upgradeNum;
@@ -1099,8 +1097,6 @@ typedef struct
   WUTeam_t  team;
 } upgradeAttributes_t;
 
-
-//TA:
 void      BG_UnpackAmmoArray( int weapon, int psAmmo[ ], int psAmmo2[ ], int *ammo, int *clips );
 void      BG_PackAmmoArray( int weapon, int psAmmo[ ], int psAmmo2[ ], int ammo, int clips );
 qboolean  BG_WeaponIsFull( weapon_t weapon, int stats[ ], int psAmmo[ ], int psAmmo2[ ] );
@@ -1249,7 +1245,7 @@ typedef enum
   ET_PLAYER,
   ET_ITEM,
 
-  ET_BUILDABLE,       //TA: buildable type
+  ET_BUILDABLE,       // buildable type
 
   ET_MISSILE,
   ET_MOVER,
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 7acf6a9b..953b939f 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1611,7 +1611,7 @@ void ClientThink_real( gentity_t *ent )
       vec3_t    mins, maxs;
       int       i, num;
 
-      //TA: look for object infront of player
+      // look for object infront of player
       AngleVectors( client->ps.viewangles, view, NULL, NULL );
       VectorMA( client->ps.origin, USE_OBJECT_RANGE, view, point );
       trap_Trace( &trace, client->ps.origin, NULL, NULL, point, ent->s.number, MASK_SHOT );
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 03c0fc50..27dcb0fc 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -761,7 +761,7 @@ void respawn( gentity_t *ent )
 {
   SpawnCorpse( ent );
 
-  //TA: Clients can't respawn - they must go thru the class cmd
+  // Clients can't respawn - they must go through the class cmd
   ent->client->pers.classSelection = PCL_NONE;
   ClientSpawn( ent, NULL, NULL, NULL );
 }
@@ -1358,7 +1358,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
 
   teamLocal = client->pers.teamSelection;
 
-  //TA: only start client if chosen a class and joined a team
+  // only start client if chosen a class and joined a team
   if( client->pers.classSelection == PCL_NONE && teamLocal == PTE_NONE )
   {
     client->sess.sessionTeam = TEAM_SPECTATOR;
@@ -1461,7 +1461,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
   ent->watertype = 0;
   ent->flags = 0;
 
-  //TA: calculate each client's acceleration
+  // calculate each client's acceleration
   ent->evaluateAcceleration = qtrue;
 
   client->ps.stats[ STAT_WEAPONS ] = 0;
@@ -1626,7 +1626,7 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
     trap_LinkEntity( ent );
   }
 
-  //TA: must do this here so the number of active clients is calculated
+  // must do this here so the number of active clients is calculated
   CalculateRanks( );
 
   // run the presend to set anything else
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index aadec5d2..e4c5d143 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -191,10 +191,10 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
     killer, self->s.number, meansOfDeath, killerName,
     self->client->pers.netname, obit );
 
-  //TA: close any menus the client has open
+  // close any menus the client has open
   G_CloseMenus( self->client->ps.clientNum );
 
-  //TA: deactivate all upgrades
+  // deactivate all upgrades
   for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ )
     BG_DeactivateUpgrade( i, self->client->ps.stats );
 
@@ -371,7 +371,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
       ScoreboardMessage( g_entities + i );
   }
 
-  self->client->pers.classSelection = PCL_NONE; //TA: reset the classtype
+  self->client->pers.classSelection = PCL_NONE; // reset the classtype
   VectorCopy( self->s.origin, self->client->pers.lastDeathLocation );
 
   self->takedamage = qfalse; // can still be gibbed
@@ -454,9 +454,6 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
   trap_LinkEntity( self );
 }
 
-
-////////TA: locdamage
-
 /*
 ===============
 G_ParseArmourScript
@@ -883,8 +880,6 @@ void G_InitDamageLocations( void )
   }
 }
 
-////////TA: locdamage
-
 
 /*
 ============
@@ -910,7 +905,7 @@ dflags    these flags are used to control how T_Damage works
 ============
 */
 
-//TA: team is the team that is immune to this damage
+// team is the team that is immune to this damage
 void G_SelectiveDamage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
          vec3_t dir, vec3_t point, int damage, int dflags, int mod, int team )
 {
@@ -1131,7 +1126,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 
     targ->lastDamageTime = level.time;
 
-    //TA: add to the attackers "account" on the target
+    // add to the attackers "account" on the target
     if( targ->client && attacker->client )
     {
       if( attacker != targ && !OnSameTeam( targ, attacker ) )
@@ -1213,8 +1208,6 @@ qboolean CanDamage( gentity_t *targ, vec3_t origin )
   return qfalse;
 }
 
-
-//TA:
 /*
 ============
 G_SelectiveRadiusDamage
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 366c0d1b..17245fc9 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -616,7 +616,6 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
   // general initialization
   G_FindTeams( );
 
-  //TA:
   BG_InitClassOverrides( );
   BG_InitBuildableOverrides( );
   G_InitDamageLocations( );
@@ -637,7 +636,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
 
   G_RemapTeamShaders( );
 
-  //TA: so the server counts the spawns without a client attached
+  // so the server counts the spawns without a client attached
   G_CountSpawns( );
 
   G_ResetPTRConnections( );
@@ -2249,7 +2248,7 @@ void G_RunFrame( int levelTime )
   level.time = levelTime;
   msec = level.time - level.previousTime;
 
-  //TA: seed the rng
+  // seed the rng
   srand( level.framenum );
 
   // get any cvar changes
@@ -2298,7 +2297,7 @@ void G_RunFrame( int levelTime )
     if( ent->freeAfterEvent )
       continue;
 
-    //TA: calculate the acceleration of this entity
+    // calculate the acceleration of this entity
     if( ent->evaluateAcceleration )
       G_EvaluateAcceleration( ent, msec );
 
@@ -2355,7 +2354,6 @@ void G_RunFrame( int levelTime )
 
   end = trap_Milliseconds();
 
-  //TA:
   G_CountSpawns( );
   G_CalculateBuildPoints( );
   G_CalculateStages( );
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 71e04108..9602943b 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -82,7 +82,6 @@ void G_ExplodeMissile( gentity_t *ent )
 
   ent->s.eType = ET_GENERAL;
 
-  //TA: tired... can't be fucked... hack
   if( ent->s.weapon != WP_LOCKBLOB_LAUNCHER &&
       ent->s.weapon != WP_FLAMER )
     G_AddEvent( ent, EV_MISSILE_MISS, DirToByte( dir ) );
diff --git a/src/game/g_mover.c b/src/game/g_mover.c
index 268a25d7..2eda08b7 100644
--- a/src/game/g_mover.c
+++ b/src/game/g_mover.c
@@ -1335,11 +1335,6 @@ void Think_SpawnNewDoorTrigger( gentity_t *ent )
   vec3_t    mins, maxs;
   int       i, best;
 
-  //TA: disable shootable doors
-  // set all of the slaves as shootable
-  //for( other = ent; other; other = other->teamchain )
-  //  other->takedamage = qtrue;
-
   // find the bounds of everything on the team
   VectorCopy( ent->r.absmin, mins );
   VectorCopy( ent->r.absmax, maxs );
diff --git a/src/game/g_public.h b/src/game/g_public.h
index fc6b7df3..c3a7dd7f 100644
--- a/src/game/g_public.h
+++ b/src/game/g_public.h
@@ -31,8 +31,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // special server behaviors
 #define SVF_NOCLIENT            0x00000001  // don't send entity to clients, even if it has effects
 
-// TTimo
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
 #define SVF_CLIENTMASK 0x00000002
 
 #define SVF_BROADCAST           0x00000020  // send to all connected clients
diff --git a/src/game/g_session.c b/src/game/g_session.c
index 81eed74f..66ac9980 100644
--- a/src/game/g_session.c
+++ b/src/game/g_session.c
@@ -73,8 +73,6 @@ void G_ReadSessionData( gclient_t *client )
 {
   char  s[ MAX_STRING_CHARS ];
   const char  *var;
-
-  // bk001205 - format
   int teamLeader;
   int spectatorState;
   int sessionTeam;
@@ -95,7 +93,7 @@ void G_ReadSessionData( gclient_t *client )
     &client->sess.ignoreList.hi,
     &client->sess.ignoreList.lo
     );
-  // bk001205 - format issues
+
   client->sess.sessionTeam = (team_t)sessionTeam;
   client->sess.spectatorState = (spectatorState_t)spectatorState;
   client->sess.teamLeader = (qboolean)teamLeader;
@@ -151,7 +149,7 @@ void G_WriteSessionData( void )
 {
   int    i;
 
-  //TA: ?
+  //FIXME: What's this for?
   trap_Cvar_Set( "session", va( "%i", 0 ) );
 
   for( i = 0 ; i < level.maxclients ; i++ )
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index 29b6a3e4..37ef22f0 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -234,7 +234,6 @@ spawn_t spawns[ ] =
   { "info_player_deathmatch",   SP_info_player_deathmatch },
   { "info_player_intermission", SP_info_player_intermission },
 
-  //TA: extra bits
   { "info_alien_intermission",  SP_info_alien_intermission },
   { "info_human_intermission",  SP_info_human_intermission },
 
diff --git a/src/game/g_svcmds.c b/src/game/g_svcmds.c
index e65015af..34ff66c5 100644
--- a/src/game/g_svcmds.c
+++ b/src/game/g_svcmds.c
@@ -51,7 +51,7 @@ If 1 (the default), then ip addresses matching the current list will be prohibit
 
 If 0, then only addresses matching the list will be allowed.  This lets you easily set up a private game, or a game that only allows players from your local network.
 
-TTimo NOTE: for persistence, bans are stored in g_banIPs cvar MAX_CVAR_VALUE_STRING
+For persistence, bans are stored in g_banIPs cvar MAX_CVAR_VALUE_STRING
 The size of the cvar string buffer is limiting the banning to around 20 masks
 this could be improved by putting some g_banIPs2 g_banIps3 etc. maybe
 still, you should rely on PB for banning instead
diff --git a/src/game/g_utils.c b/src/game/g_utils.c
index 2206341a..c03dacf5 100644
--- a/src/game/g_utils.c
+++ b/src/game/g_utils.c
@@ -122,13 +122,11 @@ int G_FindConfigstringIndex( char *name, int start, int max, qboolean create )
   return i;
 }
 
-//TA: added ParticleSystemIndex
 int G_ParticleSystemIndex( char *name )
 {
   return G_FindConfigstringIndex( name, CS_PARTICLE_SYSTEMS, MAX_GAME_PARTICLE_SYSTEMS, qtrue );
 }
 
-//TA: added ShaderIndex
 int G_ShaderIndex( char *name )
 {
   return G_FindConfigstringIndex( name, CS_SHADERS, MAX_GAME_SHADERS, qtrue );
@@ -593,7 +591,7 @@ void G_KillBox( gentity_t *ent )
     if( !hit->client )
       continue;
 
-    //TA: impossible to telefrag self
+    // impossible to telefrag self
     if( ent == hit )
       continue;
 
@@ -737,10 +735,10 @@ void G_SetOrigin( gentity_t *ent, vec3_t origin )
   VectorClear( ent->s.pos.trDelta );
 
   VectorCopy( origin, ent->r.currentOrigin );
-  VectorCopy( origin, ent->s.origin ); //TA: if shit breaks - blame this line
+  VectorCopy( origin, ent->s.origin );
 }
 
-//TA: from quakestyle.telefragged.com
+// from quakestyle.telefragged.com
 // (NOBODY): Code helper function
 //
 gentity_t *G_FindRadius( gentity_t *from, vec3_t org, float rad )
diff --git a/src/qcommon/parse.c b/src/qcommon/parse.c
index 136ba0b1..dbe30a1b 100644
--- a/src/qcommon/parse.c
+++ b/src/qcommon/parse.c
@@ -819,14 +819,14 @@ static int Parse_ReadNumber(script_t *script, token_t *token)
   {
     c = *script->script_p;
     //check for a LONG number
-    if ( (c == 'l' || c == 'L') // bk001204 - brackets
+    if ( (c == 'l' || c == 'L')
          && !(token->subtype & TT_LONG))
     {
       script->script_p++;
       token->subtype |= TT_LONG;
     }
     //check for an UNSIGNED number
-    else if ( (c == 'u' || c == 'U') // bk001204 - brackets
+    else if ( (c == 'u' || c == 'U')
         && !(token->subtype & (TT_UNSIGNED | TT_FLOAT)))
     {
       script->script_p++;
diff --git a/src/qcommon/q_math.c b/src/qcommon/q_math.c
index e987b6b5..a3a7b191 100644
--- a/src/qcommon/q_math.c
+++ b/src/qcommon/q_math.c
@@ -1134,7 +1134,6 @@ qboolean BoundsIntersectPoint(const vec3_t mins, const vec3_t maxs,
 }
 
 vec_t VectorNormalize( vec3_t v ) {
-	// NOTE: TTimo - Apple G4 altivec source uses double?
 	float	length, ilength;
 
 	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index f57575c2..74957af4 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1152,7 +1152,7 @@ typedef enum {
 	TR_LINEAR_STOP,
 	TR_SINE,					// value = base + sin( time / duration ) * delta
 	TR_GRAVITY,
-	TR_BUOYANCY //TA: what the hell is this doing in here anyway?
+	TR_BUOYANCY
 } trType_t;
 
 typedef struct {
@@ -1276,7 +1276,7 @@ typedef struct qtime_s {
 
 
 // server browser sources
-// TTimo: AS_MPLAYER is no longer used
+// AS_MPLAYER is no longer used
 #define AS_GLOBAL			0
 #define AS_MPLAYER		1
 #define AS_LOCAL			2
diff --git a/src/qcommon/surfaceflags.h b/src/qcommon/surfaceflags.h
index 31ece5cb..b597c230 100644
--- a/src/qcommon/surfaceflags.h
+++ b/src/qcommon/surfaceflags.h
@@ -60,7 +60,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define	CONTENTS_TRIGGER		0x40000000
 #define	CONTENTS_NODROP			0x80000000	// don't leave bodies or items (death fog, lava)
 
-//TA: custominfoparms below
+// custominfoparms below
 #define	CONTENTS_NOALIENBUILD			0x1000	//disallow alien building
 #define	CONTENTS_NOHUMANBUILD			0x2000	//disallow alien building
 #define	CONTENTS_NOBUILD					0x4000	//disallow alien building
@@ -85,7 +85,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define	SURF_NODLIGHT			0x20000	// don't dlight even if solid (solid lava, skies)
 #define SURF_DUST				0x40000 // leave a dust trail when walking on this surface
 
-//TA: custominfoparms below
+// custominfoparms below
 #define	SURF_NOALIENBUILD	0x80000  //disallow alien building
 #define	SURF_NOHUMANBUILD	0x100000 //disallow alien building
 #define	SURF_NOBUILD			0x200000 //disallow alien building
diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h
index 7afdf653..ad7d38b3 100644
--- a/src/ui/ui_local.h
+++ b/src/ui/ui_local.h
@@ -127,10 +127,8 @@ extern vmCvar_t  ui_scoreShutoutBonus;
 extern vmCvar_t  ui_scoreTime;
 extern vmCvar_t  ui_smallFont;
 extern vmCvar_t  ui_bigFont;
-extern vmCvar_t ui_serverStatusTimeOut;
+extern vmCvar_t  ui_serverStatusTimeOut;
 
-//TA: bank values
-extern vmCvar_t  ui_bank;
 
 
 //
@@ -746,7 +744,6 @@ typedef struct {
   const char *modDescr;
 } modInfo_t;
 
-//TA: tremulous menus
 #define MAX_INFOPANE_TEXT     4096
 #define MAX_INFOPANE_GRAPHICS 16
 #define MAX_INFOPANES         128
@@ -785,7 +782,6 @@ typedef struct
   const char      *cmd;
   tremInfoPane_t  *infopane;
 } tremMenuItem_t;
-//TA: tremulous menus
 
 typedef struct {
   displayContextDef_t uiDC;
@@ -855,7 +851,6 @@ typedef struct {
   tremInfoPane_t  tremInfoPanes[ MAX_INFOPANES ];
   int             tremInfoPaneCount;
 
-//TA: tremulous menus
   tremMenuItem_t  tremTeamList[ 4 ];
   int             tremTeamCount;
   int             tremTeamIndex;
@@ -887,7 +882,6 @@ typedef struct {
   tremMenuItem_t  tremHumanBuildList[ 32 ];
   int             tremHumanBuildCount;
   int             tremHumanBuildIndex;
-//TA: tremulous menus
 
   serverStatus_t serverStatus;
 
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 3ed44567..bdc2466c 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -290,7 +290,7 @@ int Text_Height(const char *text, float scale, int limit) {
   float max;
   glyphInfo_t *glyph;
   float useScale;
-  const char *s = text; // bk001206 - unsigned
+  const char *s = text;
   fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
   if (scale <= ui_smallFont.value) {
     font = &uiInfo.uiDC.Assets.smallFont;
@@ -343,7 +343,7 @@ void Text_Paint(float x, float y, float scale, vec4_t color, const char *text, f
   }
   useScale = scale * font->glyphScale;
   if (text) {
-    const char *s = text; // bk001206 - unsigned
+    const char *s = text;
     trap_R_SetColor( color );
     memcpy(&newColor[0], &color[0], sizeof(vec4_t));
     len = strlen(text);
@@ -469,7 +469,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
   }
   useScale = scale * font->glyphScale;
   if (text) {
-    const char *s = text; // bk001206 - unsigned
+    const char *s = text;
     trap_R_SetColor( color );
     memcpy(&newColor[0], &color[0], sizeof(vec4_t));
     len = strlen(text);
@@ -477,7 +477,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
       len = limit;
     }
     count = 0;
-    glyph2 = &font->glyphs[ (int) cursor]; // bk001206 - possible signed char
+    glyph2 = &font->glyphs[ (int) cursor];
     while (s && *s && count < len) {
       glyph = &font->glyphs[(int)*s];
       if ( Q_IsColorString( s ) ) {
@@ -616,7 +616,7 @@ static void Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4_t
   vec4_t newColor;
   glyphInfo_t *glyph;
   if (text) {
-    const char *s = text; // bk001206 - unsigned
+    const char *s = text;
     float max = *maxX;
     float useScale;
     fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
@@ -736,7 +736,7 @@ void _UI_Refresh( int realtime )
   // draw cursor
   UI_SetColor( NULL );
 
-  //TA: don't draw the cursor whilst loading
+  // don't draw the cursor whilst loading
   if( Menu_Count( ) > 0 && !trap_Cvar_VariableValue( "ui_loading" ) )
     UI_DrawHandlePic( uiInfo.uiDC.cursorx-16, uiInfo.uiDC.cursory-16, 32, 32, uiInfo.uiDC.Assets.cursor);
 
@@ -2285,7 +2285,6 @@ static void UI_DrawServerMOTD(rectDef_t *rect, float scale, vec4_t color) {
 }
 
 static void UI_DrawKeyBindStatus(rectDef_t *rect, float scale, vec4_t color, int textStyle) {
-//  int ofs = 0; TTimo: unused
   if (Display_KeyBindPending()) {
     Text_Paint(rect->x, rect->y, scale, color, "Waiting for new key... Press ESCAPE to cancel", 0, 0, textStyle);
   } else {
@@ -2304,7 +2303,6 @@ static void UI_DrawGLInfo(rectDef_t *rect, float scale, vec4_t color, int textSt
   Text_Paint(rect->x + 2, rect->y + 30, scale, color, va ("PIXELFORMAT: color(%d-bits) Z(%d-bits) stencil(%d-bits)", uiInfo.uiDC.glconfig.colorBits, uiInfo.uiDC.glconfig.depthBits, uiInfo.uiDC.glconfig.stencilBits), 0, 30, textStyle);
 
   // build null terminated extension strings
-  // TTimo: https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=399
   // in TA this was not directly crashing, but displaying a nasty broken shader right in the middle
   // brought down the string size to 1024, there's not much that can be shown on the screen anyway
   Q_strncpyz(buff, uiInfo.uiDC.glconfig.extensions_string, 1024);
@@ -3999,8 +3997,6 @@ static void UI_RunMenuScript(char **args) {
     } else if (Q_stricmp(name, "LoadMods") == 0) {
       UI_LoadMods();
     }
-
-//TA: tremulous menus
     else if( Q_stricmp( name, "LoadTeams" ) == 0 )
       UI_LoadTremTeams( );
     else if( Q_stricmp( name, "JoinTeam" ) == 0 )
@@ -4084,8 +4080,6 @@ static void UI_RunMenuScript(char **args) {
         trap_Cmd_ExecuteText( EXEC_APPEND, command );
       }
     }
-//TA: tremulous menus
-
     else if (Q_stricmp(name, "playMovie") == 0) {
       if (uiInfo.previewMovie >= 0) {
         trap_CIN_StopCinematic(uiInfo.previewMovie);
@@ -4593,7 +4587,6 @@ UI_BuildServerDisplayList
 static void UI_BuildServerDisplayList(qboolean force) {
   int i, count, clients, maxClients, ping, game, len, visible;
   char info[MAX_STRING_CHARS];
-//  qboolean startRefresh = qtrue; TTimo: unused
   static int numinvisible;
 
   if (!(force || uiInfo.uiDC.realTime > uiInfo.serverStatus.nextDisplayRefresh)) {
@@ -5074,8 +5067,6 @@ static int UI_FeederCount(float feederID) {
   } else if (feederID == FEEDER_DEMOS) {
     return uiInfo.demoCount;
   }
-
-//TA: tremulous menus
   else if( feederID == FEEDER_TREMTEAMS )
     return uiInfo.tremTeamCount;
   else if( feederID == FEEDER_TREMHUMANITEMS )
@@ -5092,7 +5083,6 @@ static int UI_FeederCount(float feederID) {
     return uiInfo.tremAlienBuildCount;
   else if( feederID == FEEDER_TREMHUMANBUILD )
     return uiInfo.tremHumanBuildCount;
-//TA: tremulous menus
 
   return 0;
 }
@@ -5273,8 +5263,6 @@ static const char *UI_FeederItemText(float feederID, int index, int column, qhan
       return uiInfo.demoList[index];
     }
   }
-
-//TA: tremulous menus
   else if( feederID == FEEDER_TREMTEAMS )
   {
     if( index >= 0 && index < uiInfo.tremTeamCount )
@@ -5315,7 +5303,6 @@ static const char *UI_FeederItemText(float feederID, int index, int column, qhan
     if( index >= 0 && index < uiInfo.tremHumanBuildCount )
       return uiInfo.tremHumanBuildList[ index ].text;
   }
-//TA: tremulous menus
 
   return "";
 }
@@ -5432,8 +5419,6 @@ static void UI_FeederSelection(float feederID, int index) {
   } else if (feederID == FEEDER_DEMOS) {
     uiInfo.demoIndex = index;
   }
-
-//TA: tremulous menus
   else if( feederID == FEEDER_TREMTEAMS )
     uiInfo.tremTeamIndex = index;
   else if( feederID == FEEDER_TREMHUMANITEMS )
@@ -5450,7 +5435,6 @@ static void UI_FeederSelection(float feederID, int index) {
     uiInfo.tremAlienBuildIndex = index;
   else if( feederID == FEEDER_TREMHUMANBUILD )
     uiInfo.tremHumanBuildIndex = index;
-//TA: tremulous menus
 }
 
 static void UI_Pause(qboolean b) {
@@ -6176,12 +6160,8 @@ vmCvar_t  ui_realCaptureLimit;
 vmCvar_t  ui_realWarmUp;
 vmCvar_t  ui_serverStatusTimeOut;
 
-//TA: bank values
-vmCvar_t  ui_bank;
 vmCvar_t  ui_winner;
 
-
-// bk001129 - made static to avoid aliasing
 static cvarTable_t    cvarTable[] = {
   { &ui_ffa_fraglimit, "ui_ffa_fraglimit", "20", CVAR_ARCHIVE },
   { &ui_ffa_timelimit, "ui_ffa_timelimit", "0", CVAR_ARCHIVE },
@@ -6305,12 +6285,8 @@ static cvarTable_t    cvarTable[] = {
   { &ui_realWarmUp, "g_warmup", "20", CVAR_ARCHIVE},
   { &ui_realCaptureLimit, "capturelimit", "8", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART},
   { &ui_serverStatusTimeOut, "ui_serverStatusTimeOut", "7000", CVAR_ARCHIVE},
-
-  { &ui_bank, "ui_bank", "0", 0 },
-
 };
 
-// bk001129 - made static to avoid aliasing
 static int    cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);
 
 
diff --git a/src/ui/ui_players.c b/src/ui/ui_players.c
index 5dbfdd3f..282fc74b 100644
--- a/src/ui/ui_players.c
+++ b/src/ui/ui_players.c
@@ -54,87 +54,6 @@ UI_PlayerInfo_SetWeapon
 */
 static void UI_PlayerInfo_SetWeapon( playerInfo_t *pi, weapon_t weaponNum )
 {
-  //TA: FIXME: this is probably useless for trem
-/*  gitem_t *  item;
-  char    path[MAX_QPATH];
-
-  pi->currentWeapon = weaponNum;
-tryagain:
-  pi->realWeapon = weaponNum;
-  pi->weaponModel = 0;
-  pi->barrelModel = 0;
-  pi->flashModel = 0;
-
-  if ( weaponNum == WP_NONE ) {
-    return;
-  }
-
-  if ( item->classname ) {
-    pi->weaponModel = trap_R_RegisterModel( item->world_model[0] );
-  }
-
-  if( pi->weaponModel == 0 ) {
-    if( weaponNum == WP_MACHINEGUN ) {
-      weaponNum = WP_NONE;
-      goto tryagain;
-    }
-    weaponNum = WP_MACHINEGUN;
-    goto tryagain;
-  }
-
-  if ( weaponNum == WP_MACHINEGUN ) {
-    strcpy( path, item->world_model[0] );
-    COM_StripExtension( path, path );
-    strcat( path, "_barrel.md3" );
-    pi->barrelModel = trap_R_RegisterModel( path );
-  }
-
-  strcpy( path, item->world_model[0] );
-  COM_StripExtension( path, path );
-  strcat( path, "_flash.md3" );
-  pi->flashModel = trap_R_RegisterModel( path );
-
-  switch( weaponNum ) {
-  case WP_GAUNTLET:
-    MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
-    break;
-
-  case WP_MACHINEGUN:
-    MAKERGB( pi->flashDlightColor, 1, 1, 0 );
-    break;
-
-  case WP_SHOTGUN:
-    MAKERGB( pi->flashDlightColor, 1, 1, 0 );
-    break;
-
-  case WP_GRENADE_LAUNCHER:
-    MAKERGB( pi->flashDlightColor, 1, 0.7f, 0.5f );
-    break;
-
-  case WP_ROCKET_LAUNCHER:
-    MAKERGB( pi->flashDlightColor, 1, 0.75f, 0 );
-    break;
-
-  case WP_TESLAGEN:
-    MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
-    break;
-
-  case WP_RAILGUN:
-    MAKERGB( pi->flashDlightColor, 1, 0.5f, 0 );
-    break;
-
-  case WP_BFG:
-    MAKERGB( pi->flashDlightColor, 1, 0.7f, 1 );
-    break;
-
-  case WP_GRAPPLING_HOOK:
-    MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
-    break;
-
-  default:
-    MAKERGB( pi->flashDlightColor, 1, 1, 1 );
-    break;
-  }*/
 }
 
 
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 2ca88cb6..0bb5b748 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -41,7 +41,7 @@ typedef struct scrollInfo_s {
 
 static scrollInfo_t scrollInfo;
 
-//TA: hack to prevent compiler warnings
+// prevent compiler warnings
 void voidFunction( void *var ) { return; }
 qboolean voidFunction2( itemDef_t *var1, int var2 ) { return qfalse; }
 
@@ -83,7 +83,6 @@ static qboolean Menu_OverActiveItem(menuDef_t *menu, float x, float y);
 #define MEM_POOL_SIZE  1024 * 1024
 #endif
 
-//TA: hacked variable name to avoid conflict with new cgame Alloc
 static char   UI_memoryPool[MEM_POOL_SIZE];
 static int    allocPoint, outOfMemory;
 
@@ -542,7 +541,7 @@ qboolean PC_Script_Parse(int handle, const char **out) {
     }
     Q_strcat(script, 1024, " ");
   }
-  return qfalse;  // bk001105 - LCC   missing return value
+  return qfalse;
 }
 
 // display, window, menu, item code
@@ -1352,13 +1351,12 @@ qboolean Item_SetFocus(itemDef_t *item, float x, float y) {
   itemDef_t *oldFocus;
   sfxHandle_t *sfx = &DC->Assets.itemFocusSound;
   qboolean playSound = qfalse;
-  menuDef_t *parent; // bk001206: = (menuDef_t*)item->parent;
+  menuDef_t *parent;
   // sanity check, non-null, not a decoration and does not already have the focus
   if (item == NULL || item->window.flags & WINDOW_DECORATION || item->window.flags & WINDOW_HASFOCUS || !(item->window.flags & WINDOW_VISIBLE)) {
     return qfalse;
   }
 
-  // bk001206 - this can be NULL.
   parent = (menuDef_t*)item->parent;
 
   // items can be enabled and disabled based on cvars
@@ -2406,7 +2404,6 @@ qboolean Item_HandleKey(itemDef_t *item, int key, qboolean down) {
     captureFunc = voidFunction;
     captureData = NULL;
   } else {
-    // bk001206 - parentheses
     if ( down && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
       Item_StartCapture(item, key);
     }
@@ -2661,7 +2658,6 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
     // see if the mouse is within the window bounds and if so is this a mouse click
   if (down && !(menu->window.flags & WINDOW_POPUP) && !Rect_ContainsPoint(&menu->window.rect, DC->cursorx, DC->cursory)) {
     static qboolean inHandleKey = qfalse;
-    // bk001206 - parentheses
     if (!inHandleKey && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
       inHandleKey = qtrue;
       Menus_HandleOOBClick(menu, key, down);
@@ -2841,12 +2837,6 @@ void Item_TextColor(itemDef_t *item, vec4_t *newColor) {
   Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
 
   if (item->window.flags & WINDOW_HASFOCUS) {
-/*    lowLight[0] = 0.8 * parent->focusColor[0];
-    lowLight[1] = 0.8 * parent->focusColor[1];
-    lowLight[2] = 0.8 * parent->focusColor[2];
-    lowLight[3] = 0.8 * parent->focusColor[3];
-    LerpColor(parent->focusColor,lowLight,*newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
     lowLight[0] = 0.8 * item->window.foreColor[0];
@@ -2908,7 +2898,7 @@ int Item_Text_AutoWrapped_Lines( itemDef_t *item )
       newLinePtr = p + 1;
     }
 
-    //TA: forceably split lines that are too long (where normal splitage has failed)
+    // forceably split lines that are too long (where normal splitage has failed)
     if( textWidth > item->window.rect.w && newLine == 0 && *p != '\n' )
     {
       newLine = len;
@@ -3085,7 +3075,7 @@ void Item_Text_AutoWrapped_Paint( itemDef_t *item )
           forwardColor = qtrue;
       }
 
-      //TA: forceably split lines that are too long (where normal splitage has failed)
+      // forceably split lines that are too long (where normal splitage has failed)
       if( textWidth > item->window.rect.w && newLine == 0 && *p != '\n' )
       {
         newLine = len;
@@ -3299,12 +3289,6 @@ void Item_TextField_Paint(itemDef_t *item) {
   parent = (menuDef_t*)item->parent;
 
   if (item->window.flags & WINDOW_HASFOCUS) {
-/*    lowLight[0] = 0.8 * parent->focusColor[0];
-    lowLight[1] = 0.8 * parent->focusColor[1];
-    lowLight[2] = 0.8 * parent->focusColor[2];
-    lowLight[3] = 0.8 * parent->focusColor[3];
-    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else {
     memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -3328,12 +3312,6 @@ void Item_YesNo_Paint(itemDef_t *item) {
   value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
 
   if (item->window.flags & WINDOW_HASFOCUS) {
-/*    lowLight[0] = 0.8 * parent->focusColor[0];
-    lowLight[1] = 0.8 * parent->focusColor[1];
-    lowLight[2] = 0.8 * parent->focusColor[2];
-    lowLight[3] = 0.8 * parent->focusColor[3];
-    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else {
     memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -3353,12 +3331,6 @@ void Item_Multi_Paint(itemDef_t *item) {
   menuDef_t *parent = (menuDef_t*)item->parent;
 
   if (item->window.flags & WINDOW_HASFOCUS) {
-/*    lowLight[0] = 0.8 * parent->focusColor[0];
-    lowLight[1] = 0.8 * parent->focusColor[1];
-    lowLight[2] = 0.8 * parent->focusColor[2];
-    lowLight[3] = 0.8 * parent->focusColor[3];
-    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else {
     memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -3397,7 +3369,7 @@ static bind_t g_bindings[] =
   { "+scores",      K_TAB,         -1, -1, -1 },
   { "+button2",     K_ENTER,       -1, -1, -1 },
   { "+speed",       K_SHIFT,       -1, -1, -1 },
-  { "boost",        'x',           -1, -1, -1 }, //TA: human sprinting
+  { "boost",        'x',           -1, -1, -1 }, // human sprinting
   { "+forward",     K_UPARROW,     -1, -1, -1 },
   { "+back",        K_DOWNARROW,   -1, -1, -1 },
   { "+moveleft",    ',',           -1, -1, -1 },
@@ -3426,12 +3398,12 @@ static bind_t g_bindings[] =
   { "weapon 12",    -1,            -1, -1, -1 },
   { "weapon 13",    -1,            -1, -1, -1 },
   { "+attack",      K_MOUSE1,      -1, -1, -1 },
-  { "+button5",     K_MOUSE2,      -1, -1, -1 }, //TA: secondary attack
-  { "reload",       'r',           -1, -1, -1 }, //TA: reload
-  { "buy ammo",     'b',           -1, -1, -1 }, //TA: buy ammo
-  { "itemact medkit", 'm',         -1, -1, -1 }, //TA: use medkit
-  { "+button7",     'q',           -1, -1, -1 }, //TA: buildable use
-  { "deconstruct",  'e',           -1, -1, -1 }, //TA: buildable destroy
+  { "+button5",     K_MOUSE2,      -1, -1, -1 }, // secondary attack
+  { "reload",       'r',           -1, -1, -1 }, // reload
+  { "buy ammo",     'b',           -1, -1, -1 }, // buy ammo
+  { "itemact medkit", 'm',         -1, -1, -1 }, // use medkit
+  { "+button7",     'q',           -1, -1, -1 }, // buildable use
+  { "deconstruct",  'e',           -1, -1, -1 }, // buildable destroy
   { "weapprev",     '[',           -1, -1, -1 },
   { "weapnext",     ']',           -1, -1, -1 },
   { "+button3",     K_MOUSE3,      -1, -1, -1 },
@@ -3442,7 +3414,6 @@ static bind_t g_bindings[] =
   { "teamvote no",  K_F4,          -1, -1, -1 },
   { "scoresUp",      K_KP_PGUP,    -1, -1, -1 },
   { "scoresDown",    K_KP_PGDN,    -1, -1, -1 },
-  // bk001205 - this one below was:  '-1'
   { "messagemode",  -1,            -1, -1, -1 },
   { "messagemode2", -1,            -1, -1, -1 },
   { "messagemode3", -1,            -1, -1, -1 },
@@ -3625,12 +3596,6 @@ void Item_Slider_Paint(itemDef_t *item) {
   value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
 
   if (item->window.flags & WINDOW_HASFOCUS) {
-/*    lowLight[0] = 0.8 * parent->focusColor[0];
-    lowLight[1] = 0.8 * parent->focusColor[1];
-    lowLight[2] = 0.8 * parent->focusColor[2];
-    lowLight[3] = 0.8 * parent->focusColor[3];
-    LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else {
     memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -3675,8 +3640,7 @@ void Item_Bind_Paint(itemDef_t *item) {
       lowLight[2] = 0.8f * parent->focusColor[2];
       lowLight[3] = 0.8f * parent->focusColor[3];
     }
-    /*LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-    //TA:
+
     memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
   } else {
     memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -4015,7 +3979,6 @@ void Item_ListBox_Paint(itemDef_t *item) {
             if (optionalImage >= 0) {
               DC->drawHandlePic(x + 4 + listPtr->columnInfo[j].pos, y - 1 + listPtr->elementHeight / 2, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
             } else if (text) {
-              //TA:
               int alignOffset = 0.0f, tw;
 
               tw = DC->textWidth( text, item->textscale, 0 );
@@ -4068,7 +4031,7 @@ void Item_ListBox_Paint(itemDef_t *item) {
     }
   }
 
-  //TA: FIXME: hacky fix to off-by-one bug
+  // FIXME: hacky fix to off-by-one bug
   listPtr->endPos--;
 }
 
@@ -4099,12 +4062,6 @@ void Item_OwnerDraw_Paint(itemDef_t *item) {
     }
 
     if (item->window.flags & WINDOW_HASFOCUS) {
-/*      lowLight[0] = 0.8 * parent->focusColor[0];
-      lowLight[1] = 0.8 * parent->focusColor[1];
-      lowLight[2] = 0.8 * parent->focusColor[2];
-      lowLight[3] = 0.8 * parent->focusColor[3];
-      LerpColor(parent->focusColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
-      //TA:
       memcpy(color, &parent->focusColor, sizeof(vec4_t));
     } else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
       lowLight[0] = 0.8 * item->window.foreColor[0];
@@ -4115,7 +4072,7 @@ void Item_OwnerDraw_Paint(itemDef_t *item) {
     }
 
     if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
-      memcpy(color, parent->disableColor, sizeof(vec4_t)); // bk001207 - FIXME: Com_Memcpy
+      Com_Memcpy(color, parent->disableColor, sizeof(vec4_t));
     }
 
     if (item->text) {
@@ -4417,9 +4374,9 @@ menuDef_t *Menus_ActivateByName(const char *p) {
     if (Q_stricmp(Menus[i].window.name, p) == 0) {
       m = &Menus[i];
       Menus_Activate(m);
-      Menu_HandleMouseMove( m, DC->cursorx, DC->cursory ); //TA: force the item under the cursor to focus
+      Menu_HandleMouseMove( m, DC->cursorx, DC->cursory ); // force the item under the cursor to focus
 
-      for( j = 0; j < m->itemCount; j++ ) //TA: reset selection in listboxes when opened
+      for( j = 0; j < m->itemCount; j++ ) // reset selection in listboxes when opened
       {
         if( m->items[ j ]->type == ITEM_TYPE_LISTBOX )
         {
@@ -5256,7 +5213,7 @@ qboolean ItemParse_cvarStrList( itemDef_t *item, int handle ) {
     }
 
   }
-  return qfalse;  // bk001205 - LCC missing return value
+  return qfalse;
 }
 
 qboolean ItemParse_cvarFloatList( itemDef_t *item, int handle ) {
@@ -5301,7 +5258,7 @@ qboolean ItemParse_cvarFloatList( itemDef_t *item, int handle ) {
     }
 
   }
-  return qfalse;  // bk001205 - LCC missing return value
+  return qfalse;
 }
 
 
@@ -5481,7 +5438,7 @@ qboolean Item_Parse(int handle, itemDef_t *item) {
       return qfalse;
     }
   }
-  return qfalse;  // bk001205 - LCC missing return value
+  return qfalse;
 }
 
 
@@ -5535,7 +5492,7 @@ qboolean MenuParse_name( itemDef_t *item, int handle ) {
 
 qboolean MenuParse_fullscreen( itemDef_t *item, int handle ) {
   menuDef_t *menu = (menuDef_t*)item;
-  if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) { // bk001206 - cast qboolean
+  if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) {
     return qfalse;
   }
   return qtrue;
@@ -5885,7 +5842,7 @@ qboolean Menu_Parse(int handle, menuDef_t *menu) {
       return qfalse;
     }
   }
-  return qfalse;  // bk001205 - LCC missing return value
+  return qfalse;
 }
 
 /*
diff --git a/ui/menudef.h b/ui/menudef.h
index d4ed0b27..0702698f 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -68,7 +68,6 @@
 #define FEEDER_FINDPLAYER               0x0e      // find player
 #define FEEDER_CINEMATICS               0x0f      // cinematics
 
-//TA: tremulous menus
 #define FEEDER_TREMTEAMS                0x10      //teams
 #define FEEDER_TREMALIENCLASSES         0x11      //alien classes
 #define FEEDER_TREMHUMANITEMS           0x12      //human items
@@ -77,7 +76,6 @@
 #define FEEDER_TREMALIENUPGRADE         0x15      //alien upgrade
 #define FEEDER_TREMALIENBUILD           0x16      //alien buildables
 #define FEEDER_TREMHUMANBUILD           0x17      //human buildables
-//TA: tremulous menus
 #define FEEDER_IGNORE_LIST              0x18      //ignored players
 
 // display flags
@@ -229,7 +227,7 @@
 #define CG_2NDPLACE 68
 #define CG_CAPTURES 69
 
-//TA: loading screen
+// loading screen
 #define CG_LOAD_LEVELSHOT         76
 #define CG_LOAD_MEDIA             77
 #define CG_LOAD_MEDIA_LABEL       78
@@ -317,7 +315,6 @@
 #define UI_STARTMAPCINEMATIC  255
 #define UI_MAPS_SELECTION     256
 
-//TA:
 //#define UI_DIALOG             257
 #define UI_TEAMINFOPANE       258
 #define UI_ACLASSINFOPANE     259