Turn off profiler, clean up unneeded code