General clean up
shifted links