Removed outdated var names from common/vars/main