No need for this guy to be linked anymore
Micro refactoring