Small cleanup of unused code.