began form cleanup and consolidation