Removed some redundant code. Stats tracking in