removal of old useless code