Merge "Remove Parser from the former Container"