First pass at removing filter related code