Merge pull request #40 from menghong777/master

Updates
Removed unused form fields.