Remove questionmark where it's not needed