- fixed empty-pre-post cleanup algorithm