Yet more cleanup. What a mess.