Removed globals and depreciated methods