cleanup and removal of extraneous logging. Now more consolidated.