Thamirabarani cleanup