last bit of clean up