Removed unused imports and debug