Further Clean up.