Start porting to new style. Clean up unused form elements.