Issue #24: removal of profiling code