Some minor code improvements
Remove profiling