Clean up API
Fix react warnings