FireyFly Remove unused variables, order includes properly
Latest commit 873db72 Nov 13, 2017