Aravind | cleaning up scripts