Updated to correctly remove tdbc links