cleanup + gsmtap support