Cleaned up warning