cleaned up, removed generated header