Yeah, the idate arc was a filler. Couldn't you tell? C'mon, a fucking lightsaber, sigh...
Edit: @Below: At least the staff was more original.