for code review only

Thank you! Indeed we probably don't have to take care of it now but it's good to have it in Jira so we won't forget about improving performance.