cleanup of deprecated vars