removal of old code