Remove legacy code from IForm