clean up of old code