Update AnaSkim, simplify