Removed vars not required