Heartbeat work
Fix double removal
Fix double removal in controllers