Removed some dead code and added a few enhancements to the forms.