doing some clean up of old/obsolete stuff