More update and Cleanup