Removed hard-coded links