Fixed zip archiving #45 #47, removed useless code (more to come)