Tapping out old rivets