Removed obsolete 3p2z code