Cleanup various files places
Updated stats and stats functions