CLeanup and updation