fix DemagFieldFK and cleanup