Use deprecated-removed directive, clean up a few markup issues around

deprecated directives.