Add report entry for state changes
Remove dead code