Cleaned up log statements