Effect header cleanup