Basic follow up and remove logic