Clean up and refactoring
delted formsection from formelement
merging from upstream