clean up of items that are not properly disposed

clean up of usage of an empty string instead of null