setva cleanups