Cleaned up warning causing code