Merge "init: remove Parser singleton and related cleanup"