removed verizon-specific props, cleaned things a little