Update TODO
Remove custom components when lost connection