Clean-up and dont mark status twice