Removed unused var - thanks @cyli
Remove stagerring related other changes - thanks @cyli