Update headers, remove code