Removed unnnecessary volume and areas calculations