clean up some function prototypes