[wallace] changes to the cleanup cal methods