simplify parser + remove unused + list -> collection + gc tuning