Removed current calc