Some cleaning.
Removed unecessary imports.