Removed variables that are not in use