Removed VersionAndBranch class to clean things up