Add links and remove debug state
Remove debug specific