It's time to end this properly