[P3]Filter cleanup (inb4 breaks things)