removed unneeded links and echoes