Cleaned up zlib and template plugin files