Finish TSDX - Remove function