Remove unnecessary local veriables
Merge branch 'puma-strategy'