Simplify regex
Remove debug output
Match beta versions