Removing MAX_OCTETS