Set up for profiling
Remove a silly hack
Remove a silly hack