Removed unneeded field
Cleaned imports