Remove unused files
Minor fixes to stats