removed everything related to zone calculations