CleanedUp some files that had unecessary code. For the sake of clarity.
Authored by: SumolX 2006-12-12
Parent: [r417]
Child: [r419]