Remove some uses of deprecated function
Merge branch 'master' of git@github.com:flack/openpsa.git
Remove unused code