further cleanup and brought alreadydonefuture back inline