Hey man. Looks like leaf spot fungus. It's quite hard to stop permanently without to much effort but looks like you've made a start. But yes, you should take off the infected leaves
Try and get something like Biobizz Leafcoat, which strengthens plants against fungus attacks. Its a spray you...