Cleanup in noproto