Cleanup in hcd