a little cleanup of before staging the first time