updates to a yet another modernization effort
remove depreciated options