Removed unused import
Fixed missing imports