[src] Some cleanup.  Get that commented code outta here