Remove commented imports if not needed?