cleanup, prerequisite for more pch usage and compile time measurements