Organize Imports
Remove deprecated fields.