Fix last commit, and do not output unnecessary information