Removed global vars