Removed unneccessary linking