Cleanup, remove unneeded logging