Remove time consuming calcs