Removed unecessary variable refs