Remove deprecated overloads and make the new and improved ones abstract