Remove space calculations