Updated to new format
Removed zombie code.
Corrected import.
Removed duplicated entry.
Updated to new format.