Use ES6 Spec for links
cleanup after we are done