close bug #1591609; remove deprecated vars