Remove form-wrapper type. Put it back in later if it becomes useful.