Removing extra logging