API simplification and cleanup.