removed reference to collision tester
cleanups includes