Final script cleaning pass