Add remove_fields option