Remove old api class