removal of old code based on JETAN tasks