remove logging and clean up.