[svrcore] Cleanup