Remove Unused Import and Comment