cleanup and context saving for parsing...

Signed-off-by: dvorkinista <villain@noironetworks.com>