Remove unused code
Fix deprecated preg_replace warning and other fixes
Merge branch 'master' of github.com:fastslack/jUpgradePro