CSR-137: removing old form classes.