removing some non-v13 stuff