Remove count code