RFC stuff removed