remove some includes and change authorship