Removed files and repaired issues after
Optimize imports