update headers and delete deprecated functions