Removed APIs, moved to submodule