remove use of deprecated functional UNIVERSAL interfaces