remove most profiling, fix build errors
rebuilt