Tidied up some unneeded logic in the Zone Controller