Some Clean up.