Removed the possibility of overlapping zones
Removed test message and unused import