remarks cleanup