Removed unused imports / file references