V1.2.5 Cleanup some old code and test for 10K