Denis,

you can save the form to a new screen / class
copy all the overwritten properties / methods
visually: if its less than a dozen of both
visually would be faster IMHO.

HTH

thomas