removing fiosaber stuff from traditional branch