clean up of old functions