Cleanup Ark & Jetty attribute references