Last touches of clean up for now