Cleaned up API discovery a little