Removed unused imports throughout project