Removing redundant loging