pre header cleanup