Remove features affected by the header cleanup and changed APIs