Use filter from vectors, free performance, and we get to delete code!