More uninitialized and unused cleanup