TODO cleanup and disposal order fix