Removed unused file
Improved imports