Clean up some prototypes