Fix elusive bug
Remove out of date findings