Some random cleanup work.