Feature/evidence cleanup

Evidence 2nd tier cleanup