cosmetic changes to remove depreciated functions