Cleanup bikeshed dfn and links

This is not entirely complete. More cleanup will be done.

Author: jungkees