[WIP] Add definitions to IP header. Delete unnesesary code