removal of necrotic v1 code