again with the cleanup