Remove ElectricityPack. Also changed energy to use integers instead of floating point values.