Feature/remove with helper