#399 Retire deprecated module variables