Updated to remove warnings abnout unused imports

Unused imports were only commented out, not removed.