Removing old template variables
template issues...