cleanup, and getting rid of superfluous logging