amend previous commit, remove cruft, no more extern function pointers