cleaned up and "completed" the link services