remove two older functions that had been replaced
Merge branch 'master' of github.com:joergdietrich/NFW into clean-up