Minor cleanup of unused fields and such.