Attempted to remove lots of react warnings