removed unneeded linkers and comments