Clean for #357