clean up, remove unneeded includes and other statements