Refactor link & link specs
Cleaned up dead specs