Table header cleanup