Beginning to strip out API for only core features