Remove extra logging and cover remaining logging functions