Remove use of  variable for 2.0 support