small changes after profiling, but no easy pickings found
removed profiling data