Removed variables that are no longer used