[cleanup] Clean up some prototypes and dead code