sorry, even though this is only for cleaning up, is this correctly implemented this way?