Removed some ETCalc dependencies