Tune small header, remove unused file