CMS-3829 Remove branching of version

Removed all branching stuff, using timestamp for comparison instead