Some cleanup of unused code.