Some cleanup of unsused imports