Remove unnecessary calculations