Form improvements etc
Delete old schema