Add parse buffer abstraction to clean-up code

Add parse buffer abstraction to clean-up code #3586