Cleanup and Change Log Update