Remove second pi definition -- should really test before committing...