Cleanup: remove model/string->forms