Removing unneeded code
Adding form-specific code to alternate classes
Removing misleading comment