moves more filters into models/views, deletes some old code