remove form
Merge branch '130608'