Fix deprecation warning about columns_for_remove