Imports organized.
Removed unused field.