Some code cleaned. Removed some unused imports.