Starting a bit of clean up.