remove has_filter
First pass at actual import