removed vars that were no longer used