Design cleanup: removed unused old form