Remove public index
Finish up the header