Cut down unused lines of code, and added Stat tracking