Maybe we should do the remove in a finally block ?