Remove deprecated config option
Push form options into data attributes
Fix up admin patients