Removing SimpleForms, see #1600