Removed log trace to speed things up