Yes, I removed them in the other places as well