API cleanup; Cut down binary size by 2