Code cleanup
Simplify redundant timestamp
Reduce use of Version
Simplify timestamp comparison