added untag to interface and removed a lot of unused stuff