Cleanup some Code to reduce Log Spawm
Version++