refact and delete some unneeded includes