Cleaned up Solaris Zone code