Form clean up

NS validation