Remove need calculate flag