Attempt to clean the code up a bit by removing the static team checks & strzone's