Cleanup after remove correctly.