Removed unused units.
Changed call to FreeAndNil to direct call to .Free.
Authored by: delphidabbler 2012-12-18
Parent: [r2602]
Child: [r2604]