Remove cruft from core ns form