Removed unused calculations