Xdbf: Cleanup