accidental debug note removed
clean up merged code