Switch to logging
remove extraneous stuff