Forms Builder -clean up